How to get meld working with git on Windows

Inspired by these instructions, I followed these steps:

  1. Install Python 2.6
  2. Install PyGTK All-in-one installer
  3. Install meld

Then you need to configure git to be able to find and invoke meld.  If you’re using the git bash shell, this can be done with these commands:

git config --global merge.tool meld
git config --global mergetool.meld.path /c/Users/andarno/Downloads/meld-1.5.2/bin/meld

Of course you may want to set your PATH to include Python permanently rather than the above command which only works for your active window.  The two git config commands have a persistent effect already, however.

Finally, you’re now ready to use meld to resolve merge conflicts.  I haven’t found a way to get “git gui” to invoke the merge tool correctly, but this command from the git bash shell works great:

git mergetool 

Related Posts

Are warning-free builds really a good thing?

I’m a big fan of pipelines that fail for warnings as well as errors. Such a policy keeps repos clean, current, less buggy, and even more agile….

Library.Template: A git repo template for .NET development

It is amazing what the .NET SDK can enable you to build with so little code. But very soon you need to add a cloud build pipeline…

Should I merge or rebase in git?

A lot has been said about whether folks should rebase, squash or merge into their git repos. It has almost gotten to the level of religious arguments…

All about RSA key formats

I’ve spent the past few weeks building up the PCLCrypto library which targets .NET Framework, Windows Store (WinRT), Windows Phone (WP8), Silverlight (SL), Xamarin.Android (XA) and Xamarin.iOS…

Moving on… DotNetOpenAuth in search for new project leaders

Disclosure and disclaimer: I am a software engineer at Microsoft, but the following post (just like all other posts on this blog) is my own and in…

Immutable collections with mutable performance

In my last post, I detailed the differences among read/write, read only, frozen and immutable collection types.  I described how immutable collections come with a hit to…

This Post Has 4 Comments

Comments are closed.