Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature Request] Option for combining two different line #142

Open
ganeshmarmat opened this issue May 6, 2019 · 3 comments
Open

[Feature Request] Option for combining two different line #142

ganeshmarmat opened this issue May 6, 2019 · 3 comments

Comments

@ganeshmarmat
Copy link

ganeshmarmat commented May 6, 2019

This tool is very useful for merging.
but some time user will need to combine the difference between two files.
as below files example:

file1.xml
image

when the tool shows the difference between files
I can only choose one of them. using "copy to right" or "copy to left"
I just want one more menu lets call it "combine and copy to left" or "combine and copy to right"
after choosing this option result will get like

file1.xml after "combine and copy to left"

image

file1.xml after "combine and copy to right"
image

@ganeshmarmat ganeshmarmat changed the title Enhancement :option for combining two different line [Feature Request] Option for combining two different line May 7, 2019
@wiggisser
Copy link

This might be especially useful for a 3-way merge where you may need to include changes from the left and the right file into the middle file. The options on the middle file could be "use left before right" and "use right before left" or something like that.

@casiosmu
Copy link

I also miss this. In TortoiseSVN-Merge it is called "use left before right" and vv.
@wiggisser Yes. But sometimes I also need this feature in 2-way.

@the-Arioch
Copy link

the-Arioch commented May 27, 2021

Frankly, if only TortoiseGit Merge would not crash for me this would be enough the reason to revert from using WinMerge for 3-way merge.

WinMerge has "select some lines and copy them only" action, and this in some cases can replace "copy Left above, then copy Right below" and "copy Right above, then copy Left below" actions.
But sadly, only in some cases.

Also, i wish there was a GUI tool for more complex scenarios, which would allow to "draw arrows" from separate lines (consequtive line blacks) to arrange more complex patterns, like that:

L01
L02
R01
L03
L04
R02
R03
R04
L05

Something like you can see on this graph editor, yet for source lines (consecutive lines blocks)
http://www.mitov.com/images/OpenWireDelphi.jpg

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

5 participants