[SCM] Conflicts: difference between "mine" and mer
One answer
It is a bit subtle (a friendly name for "confusing").
The "resolve with mine" just takes whatever you have in your workspace,
and makes that the result of the merge (after a pop-up warning).
The "resolve as merge" first checks to make sure that you actually have
changed the file (it assumes that if there has been a change, that the
change is the result of some merge tool you have invoked).
So the only difference is whether it does the "has file been changed" check.
Cheers,
Geoff
On 11/15/2011 12:08 PM, wilgiuse wrote:
The "resolve with mine" just takes whatever you have in your workspace,
and makes that the result of the merge (after a pop-up warning).
The "resolve as merge" first checks to make sure that you actually have
changed the file (it assumes that if there has been a change, that the
change is the result of some merge tool you have invoked).
So the only difference is whether it does the "has file been changed" check.
Cheers,
Geoff
On 11/15/2011 12:08 PM, wilgiuse wrote:
When having a conflict: it seems the actions "resolve with
mine" and "resolve as merged" have the same effects.
What is the difference ?
If there is no difference, why having these 2 possibilities and not
only one ? It is quite confusing.