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

131–140 of 146 posts

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

#131

Post by 7kmph »

dataflow wrote: post #73
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 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…

And the theme is unusable on KDE dark theme to a red blue color blinded user.

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

#132

Post by panick21_ »

dflock wrote: post #74

My .gitconfig for using meld at the git merge tool: [alias] mt = mergetool [merge] tool = mymeld conflictstyle = diff3 [mergetool "mymeld"] # Gives you meld, with three comparison tabs. Assuming you're merging others changes into # your branch, this shows you: # - 1st tab: yours|merged result|theirs (do the merge here into the middle pane) # - 2nd tab: base vs your changes (look at just your changes) # - 3rd tab: bas…

So this works by 'git merge feature/branch' and then call 'git mt'?

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

#133

Post by muxator »

runnerup wrote: post #83

I purchased Araxis Merge but I still find myself using Meld for the vast, vast majority of my 2- and 3- way Diffing. It’s slightly tricky to integrate into Sourcetree but once you configure Sourcetree with the correct command line args it works quite painlessly. Meld is extremely performant too. Another text editor I love is “010 Editor”, it’s the only windows app I’ve found that works well on 2+ GB files without slo…

> Meld is extremely performant too

I've ben using Meld daily for more than 10 years now. I am not so sure it can be defined "performant". Maybe your box is really powerful, but on small and mid-sized systems its performance is more on the clunky side.

I remember its performance worsened when it migrated to GTK3. It has stayed semi-slow for me since then.

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

#134

Post by epage »

maccard wrote: post #8

It's not open source, and comes with all the baggage of perforce, but p4merge and p4diff are just excellent tools that I install on every machine I work on.

As another former p4 user, know of any git tool that provides anything like p4's blame viewer (was it called "time-lapse view"?)?

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

#135

Post by btschaegg »

ncann wrote: post #103
mackrevinack wrote: post #71

Earlier quoted context omitted.

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.

I don't know if it's on par with SM, but Git Fork has a system for custom commands which result in custom context menu entries in most cases.

It uses categories like per-commit or per-branch commands.

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

#138

Post by Terretta »

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…

Since you mention folders:

https://kaleidoscope.app/

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

#139

Post by mekster »

luckman212 wrote: post #89
juddlyon wrote: post #69

Kaleidoscope on macOS isn’t cheap but has a great DX.

I too wish Kaleidoscope wasn't quite so expensive. I've had my eye on since the v3 rewrite but can't bring myself to spend $150 on a tool I'll only use occasionally. I wish there was a "lite" version for $50.

Right. I would've hesitated to upgrade if it wasn't for the upgrade discount.

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

#140

Post by distances »

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…

Another vote from here. I've tried a good number of merge tools but always go back to KDiff3. It has the best automatic merge conflict resolver I've seen, and really just enables me to fix things and continue.

I often have colleagues who are inexplicably afraid of merge conflicts and try to negotiate who's working on which parts of the app. I think a proper merge tool could help them to overcome this.

Post reply on HN