Community
Participate
Working Groups
Using egit with CDT on a C/C++ project, I did a Merge and ended up with conflicts in the .project, .cproject, and the CDT .settings file. Using a text editor, I cleaned up those files getting rid of the >>>, <<<, etc markers and merging by hand. After doing that the decorator still showed "Conflict" and I was unable to commit or merge again. I'm not sure the proper way to tell egit that I've completed the merge. What I found that seemed to work was doing a Mixed Reset. But when I committed, it seemed to also commit the files that were auto merged. I'm not sure that's correct. Signed, Confused in Ottawa.
You need to stage a resource once the conflict is resolved. The all the automerged and manually merged resources will be in final merge commit.
This is documented in the user guide, see http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_conflict
I have encountered similar situations where after failing a merge the system seems to be confused about its state and can't sort itself out. Often I have to completely reset the workspace. This is always happens when I do a merge on a resource with conflicts. I would ideally love to merge by hand, but that option is not presented to me. Thomas
