Improve handling of "Merge Links"
Right now, if you get an error like this:
http://i.imgur.com/YzSTTa1.png
You have to go to .plastic, delete plastic.merges and plastic.mergeschanges files, and then undo all the merged files from a merge link, and then try it again in hopes of it fixing itself. ( which it doesn't )
To get it to cause this error you must:
1) be on a changeset that is not up to date
2) Have 1 .exe or w/e changed
3) Have one of the latest ( newer ) changeset have the same changed .exe or w/e
4) Plastic will ask which file to keep, and no matter which choice you select, ( Source, Base or Destination ), upon trying to commit with a merge link, you will get this.
Rubat
shared this idea
-
Hello,
what you are describing is a regular "update.merge" scenario which is correctly handled by the Plastic SCM client.
I'm afraid you are not having your workspace safely-out-of-date which means you are updating your workspace with changed items ignoring the update warning report messages. Right? If that's not the case and you still think this is an issue please write us to support at codicesoftware dot com with all the needed details to reproduce the issue and we'll take care of it.
For now, closing this ticket.
