Corey

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.