Beennn Posted January 25, 2019 Report Share Posted January 25, 2019 I'm having some trouble getting a merge to finish. I went to check-in my local changes, and received a pop-up asking me to merge. I clicked merge, then processed the changes During this processing, I received a number of error windows cannot perform an exclusive lock on the same item (this also duplicated all of the files in the project with (name_conflict) amended to the file name cannot retrieve licence information from plastic scm server (this has since been resolved) I then tried shelving the changes as suggested here (https://forum.plasticscm.com/topic/20298-checkin-operation-cannot-be-started-because-there-is-a-merge-in-progress/) and got: the shelve operation is not currently available in the cloud server My pending changes window is now cluttered with a mix of my pending changes, and a mix of things part merged via the merge tool. I'm unable to choose which files to undo I'm unable to check the files in The only thing i haven't tried doing (as far as i'm aware), is undoing the changes; i'm not sure if this will undo ALL of the changes, or just the changes from the merge My question is: How can I continue the merge process? On the pending changes screen, i can see: 1 pending merge link(s) Pending merge links will be commited when you checkin your changes or reverted if you undo your changes Any help would be greatly appreciated Link to comment Share on other sites More sharing options...
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!Register a new account
Already have an account? Sign in here.Sign In Now