Maybe the inconsistency you mention comes from the case that you made the merges from (Your active changeset is part of the branch) different branches.
You should check the following link in which we explain the different types of conflicts and how the naming convention goes in those cases: https://www.plasticscm.com/mergemachine
Does this helps with your questions?
Regards, Rafael. Unity Plastic SCM Support Team
You're seriously blaming a user for the problems caused by a poorly designed system.
If you don't use the terminology a normal person would use, you're going to keep causing these problems for countless users.
Instead of telling someone how bad they screwed up, how about asking them what kind of prompt they'd expect to see, and run that by the product team?
I'm only here because I'm just as confused by this weird program that I was forced into adopting, and it—not its users—needs a lot of improvement.
Merging branches - which is Source and which is Destination?
in General
Posted
You're seriously blaming a user for the problems caused by a poorly designed system.
If you don't use the terminology a normal person would use, you're going to keep causing these problems for countless users.
Instead of telling someone how bad they screwed up, how about asking them what kind of prompt they'd expect to see, and run that by the product team?
I'm only here because I'm just as confused by this weird program that I was forced into adopting, and it—not its users—needs a lot of improvement.