我创建了一个dialog分支,当我尝试将它合并到master分支时.有2个冲突.我不知道该如何解决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.我还需要做什么？