问题
I still new to eGit. I'm trying to figure out how on earth to get eGit to resolve a merge conflict using my copy, no change. I'm referring to the notes on the eGit Wiki:
http://wiki.eclipse.org/EGit/User_Guide#Possible_merge_results
However, when I add my copy to resolve the conflict, eGit still leaves the diff marks in the file "<<<<<<< HEAD", "=======", ">>>>>>>". The doc says to add after using Merge-Tool:
edit the working tree version until you are happy with it Team > Add the merged resource to mark the conflict as resolved commit the merge commit via Team > Commit
However, it still leaves the diff marks in the file after I've resolved the conflict using my copy, which really results in no change, and therefore, requires no save. My question is how do I get eGit to accept, add, and commit my copy without leaving the diff markers in the file? Will these markers go away at the final commit?
回答1:
While the bug is solved, do what is suggested on the bug comments
Frank Jakop CLA 2013-07-08 09:53:34 EDT We wold very appreciate this too, at the moment we have to "workaround" by inserting and then deleting a space in the file, save and add to index.
来源：https://stackoverflow.com/questions/9790016/egit-merge-resolution-use-your-copy