Hey,
I have a situation where I want to delete and ignore some generated files in the repository. Meanwhile, somebody else changed those files. Now I want to rebase
my commit that includes the deletion of those files. Now there is some different behaviour between C and E/JGit:
In EGit I get the checkout conflict dialog stating that rebase cannot continue, as I have files that would block the rebase. I cannot actually come out of that
situation, as I cannot reset (I’m current already), I cannot stash (there are no changes) and I cannot commit (again: no changes). The only way to get out of here without C-Git is to delete the now-ignored files in the working tree and re-try the rebase. This
can be quite tedious if it is a lot of generated files.
With C-Git, the behaviour is different. It recognizes that there is a modify/delete conflict during the rebase, and marks the files accordingly. I then just delete
them and go with rebase –continue, and all is well.
Is there any rationale behind this behaviour or is it a bug?
Cheers,
Markus
--
Mit freundlichen Grüßen / Best regards
Markus Duft | Software Architect
SSI SCHÄFER | Salomon Automation GmbH | Friesachstraße
15 | 8114 Friesach bei Graz | Austria
Phone +43 3127 200-575 | Fax +43 3127 200-22
markus.duft@xxxxxxxxxxxxxxxx
Website |
Blog |
YouTube |
Facebook