Jump to content

Leaderboard


Popular Content

Showing content with the highest reputation on 04/19/2012 in all areas

  1. 1 point
    Hi there. I've seen quite a few reports of this similar message on the forum: "Checkin operation cannot be started because there is a merge in progress. Finish it before checkin the changes. In progress merge. Merge from cset xxx." But I still don't know what to do about it, and my colleagues bang their heads into the same problem. We can't check in but who knows how to do this merge? Sometimes while we can't do it in Visual Studio it works in the client app, but sometimes that doesn't work either. The only cast-iron solution seems to be to undo everything losing all changes, then update workspace and try again. There's a real logical problem to this since there doesn't seem to be any option to merge these changes. It seems in v3 the merge happened immediately but now it's being deferred and then breaking the checkin. Is there some real foolproof guide to how this should be working now? I can't even work out what it is that's going on, what the problem is, how to guarantee to solve it. Our designer to use Plastic too and he really doesn't know what he's doing, but at least v3 seemed logical and simple. None of us know what to do to solve this problem in v4. I've attached a screenshot. This is from our designer. He's not even aware of any merge. He just tried to make a small change to the existing workspace, but presumably his workspace was out of date when he came to check in. (It's difficult to persuade him to start a new branch to make one tiny change, and to be honest that seems like overkill to me too, otherwise we're going to end up with hundreds of branches filling up the branch list and getting in the way. Until there's a way to archive completed branches it's not something I want to do anyway.) The question is, how do you "finish" a merge? There doesn't seem to be any button or option to do that. Thanks.
×
×
  • Create New...