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...
This topic is now archived and is closed to further replies.