Apply BOTH versions of a change?

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
bpostow@yahoo.com
Posts: 1
Joined: Wed Oct 30, 2019 2:00 pm

Apply BOTH versions of a change?

Post by bpostow@yahoo.com » Wed Oct 30, 2019 2:07 pm

I will often have a chunk of code, and one person added a line, and another person added a totally different line at the same place. I want both of them.

So, the original file is:

Code: Select all

Foo
Bar
Version 1 is:

Code: Select all

Foo
BAZ
Bar
Version 2 is:

Code: Select all

Foo
BUQ
Bar
The merged version I want is:

Code: Select all

Foo
BAZ
BUQ
Bar
(typically, I don't care about the order of BAZ and BUQ because they came in independently...)

Currently, I'm choosing whichever is longer and cutting and pasting the other one in, but that makes DiffMerge tell me that there's still a difference I need to fix...

Is there a better way to do this?

Tonya
Posts: 512
Joined: Thu Jan 20, 2005 1:47 pm
Location: SourceGear

Re: Apply BOTH versions of a change?

Post by Tonya » Thu Oct 31, 2019 12:16 pm

Hello,

We have looked into your inquiry to see if we could provide you with an alternative. We have reproduced what you are describing and will log this as a work item to be considered in an upcoming release.

Thank you for providing us with feedback.

Tonya

Post Reply