Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

Meld is a visual diff and merge tool targeted at developers

meldmerge.org

Post reply on HN
Print view View original

61–70 of 146 posts

Re: Meld is a visual diff and merge tool targeted at developers

#61

Post by rdiddly »

anamexis wrote: post #58
codedokode wrote: post #43

Meld might be useful for comparison, but in my opinion it is inconvenient as a git merge tool. For git merge I need four panels: original file, version A, version B, merged result. Meld has only three panels. Currently I am using KDiff3. It is a little buggy and doesn't have a nice UI but it is the best open source merging tool that I am aware of. It allows choosing lines from original file, from A, B and manual edit…

> original file, version A, version B, merged result Isn't one of version A or B the original file? What am I missing?

In a merge conflict versions A & B would tend to be different changes made to the original, usually made by different people.

Re: Meld is a visual diff and merge tool targeted at developers

#62

Post by rubyist5eva »

brunno wrote: post #40

As a long time Sublime Text[1] user, I've been using Sublime Merge[2] since the day it's been launched and it brings me the same speed and minimalism I get with Sublime Text and has evolved quite a lot to be able to do most things I need in a merge tool. Not affiliated with them in any way by the way. [1] https://www.sublimetext.com/ [2] https://www.sublimemerge.com/

Sublime Merge is a fanastic tool (I use it) but it's less of a merge tool and more of a git client, which I think is an important distinction.

Re: Meld is a visual diff and merge tool targeted at developers

#63

Post by rubyist5eva »

anamexis wrote: post #58
codedokode wrote: post #43

Meld might be useful for comparison, but in my opinion it is inconvenient as a git merge tool. For git merge I need four panels: original file, version A, version B, merged result. Meld has only three panels. Currently I am using KDiff3. It is a little buggy and doesn't have a nice UI but it is the best open source merging tool that I am aware of. It allows choosing lines from original file, from A, B and manual edit…

> original file, version A, version B, merged result Isn't one of version A or B the original file? What am I missing?

the "original" file is the common ancestor of version A and version B

Re: Meld is a visual diff and merge tool targeted at developers

#64

Post by rubyist5eva »

crispyalmond wrote: post #42
diego_moita wrote: post #16

IMHO, Meld is the second best open source tool for doing this. On Windows, WinMerge[1] is a better alternative. Too bad is Windows only. For a non-FOSS and cross platform solution I recommend BeyondCompare (U$30.00)[2]. It replicates most of WinMerge UI. [1] https://winmerge.org/ [2] https://scootersoftware.com/

Do you think the pro version of BeyondCompare is worth it compared to the standard one?

Yes, I bought it years ago and it's been one of my goto tools. Worth every penny, plenty of features beyond just being a git mergetool.

Re: Meld is a visual diff and merge tool targeted at developers

#66

Post by vocram »

gebruikersnaam wrote: post #13
noselasd wrote: post #7

If you want to use it with git: git config --global diff.tool meld git config --global --add difftool.prompt false And use git difftool instead of git diff

On my Ubuntu based (Xubuntu, Mint) workstations this works without any configuration $ meld .

That command is only for diffing against Git HEAD. `git difftool` supports all the ways to diff with Git.

Re: Meld is a visual diff and merge tool targeted at developers

#68

Post by diego_moita »

bmitc wrote: post #36
diego_moita wrote: post #16

IMHO, Meld is the second best open source tool for doing this. On Windows, WinMerge[1] is a better alternative. Too bad is Windows only. For a non-FOSS and cross platform solution I recommend BeyondCompare (U$30.00)[2]. It replicates most of WinMerge UI. [1] https://winmerge.org/ [2] https://scootersoftware.com/

I setup Git to use Perforce’s P4Merge as the Git mergetool. P4Merge is cross-platform and free and quite good.

There are 2 things to consider when comparing them: 2 panel diffs and 3 panel merging.

P4Merge is very good at the second but not so much at the first.

Also, to this date it doesn't have an OS-X version for M1 CPUs.

Re: Meld is a visual diff and merge tool targeted at developers

#70

Post by diego_moita »

crispyalmond wrote: post #42
diego_moita wrote: post #16

IMHO, Meld is the second best open source tool for doing this. On Windows, WinMerge[1] is a better alternative. Too bad is Windows only. For a non-FOSS and cross platform solution I recommend BeyondCompare (U$30.00)[2]. It replicates most of WinMerge UI. [1] https://winmerge.org/ [2] https://scootersoftware.com/

Do you think the pro version of BeyondCompare is worth it compared to the standard one?

Depends...

Pro version gives you 3 panel merging. If you use that a lot then it might be worth it. Or, instead, use P4Merge for it.

Post reply on HN