cidico Posted April 17, 2012 Report Share Posted April 17, 2012 Hi! I was working yesterday and I performed a merge. There's a pending merging and seems I can't do a checkin. I keep getting an error: C:\Projetos\Franchise>cm ci The selected items are about to be checked in. Please wait ... Error: Checkin operation cannot be started because there is a merge in progress: Finish it before checkin the changes. In progress merge: Merge from cset 152 The same error is displayed at the GUI. My only problem here is that I didn't noticed that the merging was pending. So I kept working normally. Now, I have the merge and the changes I did yesterday afternoon. FUUU!! How can I solve this?? Link to comment Share on other sites More sharing options...
cidico Posted April 17, 2012 Author Report Share Posted April 17, 2012 Well, Sorry to bother... I just "unco" and will do all the work again...! But it really was a very strange thing. Link to comment Share on other sites More sharing options...
manu Posted April 17, 2012 Report Share Posted April 17, 2012 Maybe you started a merge from cset 152 and you didn't process all the candidates? Link to comment Share on other sites More sharing options...
cidico Posted April 17, 2012 Author Report Share Posted April 17, 2012 Hi Manu, I really don't know what happened. I remember I did the merge and then performed the checkin. The cset 152 is a "old" cset. Look the picture here to see what I'm talking about. The red circle is the cset 152 and the blue one is the cset I tried to make the check in. I even tried to move the changes to another branch but nothing changed. Link to comment Share on other sites More sharing options...
cidico Posted April 17, 2012 Author Report Share Posted April 17, 2012 PS: Ignore the branch color.. is just a joke I made with our designer here... Link to comment Share on other sites More sharing options...
manu Posted April 17, 2012 Report Share Posted April 17, 2012 OMG! my eyes!!!! are burning due to that colors!!!! Why!!!!!???? Link to comment Share on other sites More sharing options...
manu Posted April 17, 2012 Report Share Posted April 17, 2012 Ok, if this problem returns to you we can have a short meeting to investigate it. Link to comment Share on other sites More sharing options...
cidico Posted April 17, 2012 Author Report Share Posted April 17, 2012 Ok! Just to add some info, even the error being displayed, the server log does not contains any info regarding this error. Is it normal? Link to comment Share on other sites More sharing options...
manu Posted April 17, 2012 Report Share Posted April 17, 2012 Yes, because it's a client restriction. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.