# How to resolve mixture of modified and deleted conflicts easily in git? 2 messages from 2017-10-31 to 2017-11-04. Participants: Robert Dailey, Philip Oakley. Thread: https://gitlist.dev/t/47084 ## Robert Dailey, 2017-10-31 16:31 Subject: How to resolve mixture of modified and deleted conflicts easily in git? Message-ID: URL: https://gitlist.dev/e/CAHd499AsY30b8LuCvjap-mZyzBEVsjK__We6Yh-y%3D5GqijObhw%40mail.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. ``` ## Philip Oakley, 2017-11-04 19:10 Subject: Re: How to resolve mixture of modified and deleted conflicts easily in git? Message-ID: <34068C1EF5694EBC8B86E1FF44B134FF@PhilipOakley> URL: https://gitlist.dev/e/34068C1EF5694EBC8B86E1FF44B134FF%40PhilipOakley In-Reply-To: ``` From: "Robert Dailey" > 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. Can you give the example commands and response? In particular note the comment in the rebase command that the ours/theirs viewpoints are swapped, so you may find your stated "ours" should be (mid rebase) seen as "theirs". -- Philip ```