Jump to content

Cannot check in merge because ... there is a merge in progress???


Recommended Posts

This merge seems to be stuck in a catch 22 - I can't check in the merge because the merge is in progress

I didn't make any file changes, and verified that all files to be checked in are of the status "Merge from 2579" (the merge changeset in question)

Spent a morning restarting plastic and trying this merge multiple times.  Please advise.


Edited by Corey
clarifying issue and question
Link to comment
Share on other sites

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

Sign in

Already have an account? Sign in here.

Sign In Now
  • Create New...