views:

13

answers:

0

I did a merge yesterday using subversive in eclipse 3.6 but there are plenty of conflicts. I closed eclipse before I finished editing the conflicts and was hoping to resolve the conflicts today. However when I open eclipse again today, I can't resolve the conflicts anymore.

The options appear in the right click menu are

"Overwrite and Commit",

"Overwrite and Update",

"Mark as merged".

None of them is what I want because I need to resolve conflicts before I can commit. If I use edit conflict I can only copy texts from the right to the left. If I choose "Overwrite and Update" it will use the copy in the repository but I just want to keep local copy. If I "Mark as merged" it wouldn't change anything and those "working" and "merge-right" tags remain in the merged file. Do I need to manually remove all the conflicts then? What else can I do to resolve the conflicts?