How to resolve mixture of modified and deleted conflicts easily in git?
- From
- Robert Dailey <rcdailey.lists@gmail.com>
- Date
- Oct 31, 2017, 16:31 UTC
- Message-ID
- <CAHd499AsY30b8LuCvjap-mZyzBEVsjK__We6Yh-y=5GqijObhw@mail.gmail.com>
When doing a rebase, sometimes I will get `DU` and `UU` conflicts (locally deleted and locally modified, respectively). Furthermore, in some of these cases, I want to take "ours" for all conflicts, including ones where the local file is deleted. Ideally, it's just one command:
$ git checkout --ours .
However, this fails for the locally deleted conflicts:
error: path 'foo.xml' does not have our version
Even more annoyingly, the fact that these failures occur prevents the `UU` conflicts from being resolved. The whole operation fails atomically. I am not aware of a straightforward and uniform way to resolve conflicts with "ours" during a rebase when locally deleted files exist in the list of conflicts. What is the most elegant solution in this situation?
I'm running Git for Windows v2.13.1.