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

101–110 of 146 posts

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

#101

Post by csmiller »

mackrevinack wrote: post #71
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/

a nice feature of sublime merge that i haven't seen in other programs is actually showing you the git commands that will run when you press whatever button

i believe the IntelliJ Git tool window does this as well FWIW

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

#102

Post by JSoet »

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…

I agree 100% on the utility of a 4 panel diff, but I'd be careful using kdiff3... I also used it for quite a while but found that it would "auto resolve" some merge conflicts which git would flag, and I found it would sometimes auto resolve them wrong (maybe about 10-20% of the time?), and I couldn't figure out how to turn this feature off... I'm using tortoise git merge now (which also does do some auto resolve but only simpler resolutions)

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

#103

Post by ncann »

mackrevinack wrote: post #71
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/

a nice feature of sublime merge that i haven't seen in other programs is actually showing you the git commands that will run when you press whatever button

Also the ability to create custom menu items (e.g for any context menu) for whatever command you desire. It's a game changer for me that I haven't seen in any other git client.

Also it's lightning fast and relatively bug free compared to the mess that is Sourcetree, which used to be my favorite client but then went utterly downhill.

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

#104

Post by ncann »

recov wrote: post #51
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/

Same here. So far it's my favorite UX for solving non-trivial merge conflicts.

Same. I don't know why but there's something so intuitive and easy to use and yet so powerful about Sublime Merge's merge tool that it quickly became my favorite after having used a lot of different other tools in the past (TortoiseGit, Meld, etc.)

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

#105

Post by andreineculau »

eddyg wrote: post #99
Xenoamorphous wrote: post #79

I wish it worked better in MacOS. Still my favourite tool.

https://kaleidoscope.app/ is by far the best Mac solution.

For diffing yes but for merging... I have never gotten myself to use anything but DiffMerge. And now with their rewrite and price tag... Never ever.

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

#106

Post by andreineculau »

HelloNurse wrote: post #59

> On OS X, Meld is not yet officially supported. For pre-built binaries, these OS X builds are the best option. > You can also get Meld from MacPorts, Fink or Brew; none of these methods are supported. Can anyone recommend any of these unsupported options? The best diff GUI tool I've been able to find for OSX is DiffMerge ( https://sourcegear.com/diffmerge/ ) on the App Store, and I'd like to have a tree view for fol…

I second that. DiffMerge every day for almost 10y

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

#107

Post by forrestthewoods »

rubyist5eva wrote: post #62
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.

Yeah. I would be interested in using Sublime Merge as a Merge tool for projects based in Perforce and Mercurial. But last I checked it wasn't really capable of that.

It should have been called Sublime Git. Alas.

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

#108

Post by tigerlily »

olvy0 wrote: post #84
dataflow wrote: post #73

Earlier quoted context omitted.

I actually don't understand what people love about BC. The only thing I find it extremely useful for is the occasional files where inline diffs are practically mandatory, like CSVs. Other than that, I generally find it frustrating compared to TortoiseGitMerge, except perhaps for some very specific/unusual scenarios. In particular the line highlighting is annoying - instead of coloring the lines that were added vs. re…

+1 for TortoiseGitMerge, which is my go-to tool these days. It's Windows only but not a problem for me since I mostly work in Windows. My SO adores Meld, but she works with Linux. I tried using it but couldn't get used to it. She also makes fun of me (half in jest) because I use Tortoise Git instead of the command line...

I use TortoiseGit too, ever since I used TortoiseSVN back in the day. Highly underrated, and ridiculously powerful, I’ve practically never had to look up “how to do x” :)

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

#109

Post by bacon_waffle »

JSoet wrote: post #102
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…

I agree 100% on the utility of a 4 panel diff, but I'd be careful using kdiff3... I also used it for quite a while but found that it would "auto resolve" some merge conflicts which git would flag, and I found it would sometimes auto resolve them wrong (maybe about 10-20% of the time?), and I couldn't figure out how to turn this feature off... I'm using tortoise git merge now (which also does do some auto resolve but…

According to `kdiff3 --help`, there's a flag --qall "Do not solve conflicts automatically.".

I've not noticed the problem you describe, so can't confirm whether it is solved by that flag - a while ago I mostly switched to Sublime Merge from kdiff3.

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

#110

Post by zmmmmm »

loloquwowndueo wrote: post #47

Since everyone else is mentioning other tools, here’s my mention for vimdiff. I think I have meld installed but rarely use it because vimdiff is usually enough. As a bonus I get to use my usual editing keys when working with it.

same here!

it may not be the best merge tool in existence but it's adequate (which is actually, suprisingly good, given it is not at all its intended function) and at that point having all my standard vim configuration, editing capabilities etc. beats anything another tool would bring to the table.

Not to mention, 100% terminal UI and built-into-vim means I can use it everywhere and anywhere without thinking about it.

Post reply on HN