fehaar Posted November 15, 2013 Report Share Posted November 15, 2013 I have arrived in a dead end situation with a merge. The merge window tells me that there are three Automatic merges left - but it refuses to process them. So I cannot finish the merge. I cannot check in either, because the merge is not finished. The only option I have is to undo. I have tried this and tried the merge again with the same failure. How do i progress from here? Is there a command line option I can use to force the merge to resolve or to process the automatic changes? Link to comment Share on other sites More sharing options...
manu Posted November 15, 2013 Report Share Posted November 15, 2013 I guess this is the same issue as here: http://www.plasticscm.net/index.php?/topic/1727-unable-to-complete-merge/ right? Link to comment Share on other sites More sharing options...
fehaar Posted November 15, 2013 Author Report Share Posted November 15, 2013 Yes it is... Sorry 'bout that. I saw the old thread and continued there as I tried out the suggestions from that. Link to comment Share on other sites More sharing options...
manu Posted November 15, 2013 Report Share Posted November 15, 2013 No prob Let's continue in the other topic. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.