Merge issue (only merge last change)

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 1
Joined: Fri Nov 19, 2010 9:05 am
PostPosted: Fri Jan 28, 2011 8:42 am
Hi,

We have the following situation:
* User A edits a file and checks-in in our development environment
* User B edits the same file later and checks-in in our development environment

Now we only want the changes of user B merged into our testing environment. Via merge branches we choose the check-in of User B. Now SourceGear Vault Pro 5.1.1. tells that there is 1 merge conflict. Except the conflict all changes of User B are merged correctly and the changes of User A are ignored.

DiffMerge 5.1.1. shows the conflict is in 2 connected lines. Line 1 is changed by User B and line 2 by User A. The proposal from DiffMerge is to merge the line of the wrong user to the center.

Is it possible that SourceGear merges this automatically without giving a conflict? Is it possible that Diffmerge merges the correct line?

If you like I can send a screendump of the situation!

Kind regards,

Erwin ten Velde

Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear
PostPosted: Fri Jan 28, 2011 5:18 pm
Yes, it would be helpful to have screenshots.

Send them to support at sourcegear.com, Attn: Linda. Please include a link to this forum post.
Linda Bauer
SourceGear
Technical Support Manager

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 1 guest