How do I fix a merge conflict due to removal of a

问题:

I have create a dialog branch and when I try to merge it to master branch. There are 2 conflicts. I don't know how to resolve CONFLICT (delete/modify). Can you please tell me what to do?

$ git checkout master
$ git merge dialog
CONFLICT (delete/modify): res/layout/dialog_item.xml deleted in dialog and modified in HEAD. Version HEAD of res/layout/dialog_item.xml left in tree.
Auto-merging src/com/DialogAdapter.java
CONFLICT (content): Merge conflict in src/DialogAdapter.java
Automatic merge failed; fix conflicts and then commit the result.

I have opened src/DialogAdapter.java, fixed the conflict and did a git add src/DialogAdapter.java. What else do I need to do?

回答1:

The conflict message:

CONFLICT (delete/modify): res/layout/dialog_item.xml deleted in dialog and modified in HEAD

means that res/layout/dialog_item.xml was deleted in the 'dialog' branch you are merging, but was modified in HEAD (in the branch you are merging to).

So you have to decide whether

• remove file using "git rm res/layout/dialog_item.xml"

or

• accept version from HEAD (perhaps after editing it) with "git add res/layout/dialog_item.xml"

Then you finalize merge with "git commit".

Note that git will warn you that you are creating a merge commit, in the (rare) case where it is something you don't want. Probably remains from the days where said case was less rare.

回答2:

I normally just run git mergetool and it will prompt me if I want to keep the modified file or keep it deleted. This is the quickest way IMHO since it's one command instead of several per file.

回答3:

If you are using Git Gui on windows,

1. Abort the merge
2. Make sure you are on your target branch
3. Delete the conflicting file from explorer
4. Rescan for changes in Git Gui (F5)
5. Notice that conflicting file is deleted
6. Select Stage Changed Files To Commit (Ctrl-I) from Commit menu
7. Enter a commit comment like "deleted conflicting file"
8. Commit (ctrl-enter)
9. Now if you restart the merge it will (hopefully) work.