Unmark as merged

Question

I use Eclipse Indigo and subeclipse as an svn plugin for eclipse. Now here is the situation. I synchronized my project with a remote repository. There were conflicts, and I mistakenly clicked on the "mark as merged" for one of the files without merging it. I tried restarting eclipse and some other silly hacks. But nothing happens. So is there a way to undo the "mark as combined" action?

Answer 1

Marking as Merged means that the local version of the file contains the content you need after comparing the files and solving the problems manually. Subclipse still needs to update the local file so that the SVN metadata is happy, so it saves the current contents of the file, starts the svn update, and then replaces the file.

So, now you can run Team> Revert if you want the file to match what was in the repository, or Compare with> Base Revision if you just want to explore the differences again and possibly make additional changes.

Answer 2

None of the Marks suggestions worked for me. The class returned back to its original (previously merged) state, but the attempt to merge again simply gave me the message "no differences were found."

What worked for me is to compare s> Local History. I was able to select the version that was right before I click Mark As Merged, and that brought me back to the Compare Editor view that I had during the initial Merge (which showed all the conflicts). Then I was able to change the code correctly, and Mark C Merged again.

Answer 3

Delete the local project and re-import it, and this will cancel the random action "Mark as merged". Just make sure that the deletion does not result in loss of incomplete work.