|How to undo CVS "Mark As Merged" [message #522584]
||Tue, 23 March 2010 09:07
Originally posted by: adam.lipscombe.gmail.com|
I am performing a complex merge and I have incorrectly marked 2 files as
merged using the "mark as merged" option. The are not merged correctly
and I need to re-merge them
How can I undo the "mark as merged"?
If I press the synchronisation view "refresh" button, or even restart
Eclipse the "mark as merged" setting for these 2 files persists.
The "Edit->Undo" and "Edit->Redo" options are greyed out.
What I want to do is to start the merge again from scratch, or at least
for the source package that contains the files in question.
Thanks - Adam
Powered by FUDForum
. Page generated in 0.02118 seconds