Feature Request: Merge from both sides in 3 way merge

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 1
Joined: Fri May 11, 2012 3:48 pm
PostPosted: Fri May 11, 2012 3:58 pm
I've been a long time DiffMerge user and for the part have been very happy with it. One thing I would like to see though is being able to merge both sides of a conflict to the resulting file in a 3 way merge. Oftentimes I find that the conflicts that can't be automatically merged need to be resolved by applying the changes from both sides. As it is right now, I can choose only to keep the left side or the right side and then need to manually copy the other side into the result.

Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Mon May 14, 2012 7:49 am
Are you needing to place the changes right in the middle of each other, or just one after another?

If you see a difference, you should still be able to prepend it or append it to what you placed in. Just right-click a difference and you'll see prepend and append in the menu.

If you need changes to go inside of each other, then I will have to take a feature request.
Beth Kieler
SourceGear Technical Support

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 1 guest

cron