tlodato Posted October 12, 2012 Report Share Posted October 12, 2012 How do I abort a merge? I tried to merge a branch but one of the files cannot be reconciled due to some permission issues (warn.log). I cannot selve the current changes or get rid of the merge link. I want to abort so I can cherry pick changes, but now I am unable to do anything. I tried from the command line, but I am not really sure about what I need to do. Any thoughts? Link to comment Share on other sites More sharing options...
carpediemevive Posted October 12, 2012 Report Share Posted October 12, 2012 Typically I abort a merge by undoing changes in the pending changes view. Did you try this and it didn't work? Link to comment Share on other sites More sharing options...
manu Posted October 16, 2012 Report Share Posted October 16, 2012 As carpediemevive said, you can use the pending changes view to undo the aborted merge. You can also use the command line and issue the "cm unco" command in the root of your workspace in order to restore the old content. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.