我创建了一个名为dialog
的分支,现在当我试图将其与master
分支合并时,发生了两个冲突。我不知道如何解决CONFLICT(delete/modify)
。你能告诉我该怎么做吗?
$ 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.
我已经打开了src/DialogAdapter.java
,解决了冲突,并执行了git add src/DialogAdapter.java
。还需要做什么?