Jump to content

Search the Community

Showing results for tags 'checkin'.



More search options

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

Found 3 results

  1. 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.
  2. We're evaluating Plastic using the regular client (not gluon) and there's one aspect about it that seems to work against our normal workflow (as opposed to Perforce which we're used to). At any one time I'll have 10 files checked out. I will undo about 5, check in 2, and keep the other 3 untouched. The ones I want untouched, I might have checked out for weeks (or months) through multiple checkins, and eventually check in or sometimes undo. In Plastic this workflow is problematic. I can't just check in the 2/10 files and merge them into the main branch on their own. It either wants me to put them on a separate branch and then merge to the main branch, or do a messy merge with main where it tries to merge all my pending changes - not just the 2 I want to check in. I know it probably works this way in Gluon (haven't tried it), but I want to know if there's a way to do it in the regular client. I don't think source control should dictate our company's workflow, so I hope there's something I'm missing.
×
×
  • Create New...