{"id":4251481,"date":"2017-04-08T13:06:03","date_gmt":"2017-04-08T13:06:03","guid":{"rendered":"https:\/\/www.deptagency.com\/insight\/using-meld-as-a-git-merge-tool-on-windows\/"},"modified":"2017-04-08T13:06:03","modified_gmt":"2017-04-08T13:06:03","slug":"using-meld-as-a-git-merge-tool-on-windows","status":"publish","type":"article","link":"https:\/\/www.deptagency.com\/en-uki\/insight\/using-meld-as-a-git-merge-tool-on-windows\/","title":{"rendered":"Using meld as a Git merge tool on Windows"},"content":{"rendered":"
\n\t\n\t<\/svg>\n\t\t\t\n\t\t\tBack to all articles\t\t<\/span>\n\t\n<\/button>\n\t\tUsing meld as a Git merge tool on Windows\t<\/h1>\n\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t<\/picture>\n\t\n\t<\/div>
\n\t\t\t\n\t\n\t
\n\t\tJames Simm\t\t
\n\t\tHead of Engineering\n\t\t\t<\/div>\n<\/div>\n\t
\n\t\t\t\t\t\t\t
\n\t\t\t\t
\n\t\t\t\t\tDate\t\t\t\t<\/div>\n\t\t\t\t
\n\t\t\t\t\t8 April 2017\t\t\t\t<\/div>\n\t\t\t<\/div>\n\t\t\t\t<\/div>\n<\/div>\n\n
\n\t
\n\t\t\n\t\t\t\t\t
\n\t\t\t\t\n\n\t\tRecently Windows 10 has updated with the \u201cCreators Update\u201d which, while I know you\u2019re all really excited for the 3D mode for MS Paint, also includes a whole host of updates for the\u00a0Windows Subsystem for Linux<\/a>, including Windows Linux interoperability.\t<\/h2>\n\n\n\t\tWhat does this mean? Well, among other things, you can now launch windows programs from your bash command line. One nice way we can make use of this is triggering a nice gui-based merge tool from the git command line.\t<\/p>\n\n\n\t\tPersonally, I quite like\u00a0Meld<\/a>\u00a0which is a nice free diffing tool for text.\t<\/p>\n\n\n\t\tSo to launch Meld as your diffing tool for git merges you simply need to do the following:\t<\/p>\n\n\n\t\t1) First, create a script to pass things over to meld:\t<\/h2>\n\n\n\t\tnano meld<\/code>

#!\/bin\/bash<\/code>

\/mnt\/c\/Program\\ Files\\ \\(x86\\)\/Meld\/Meld.exe $@<\/code>

This just launches the program and passes over any arguments using

the$@<\/code>
\t<\/p>\n\n\n\t\t2) Copy over the new script to your bin directory with:\t<\/h2>\n\n\n\t\tsudo cp meld \/bin\/<\/code>

This allows us to launch it from wherever we want.\t<\/p>\n\n\n\t\t3) Then in your .Gitconfig you just need:\t<\/h2>\n\n\n\t\t[merge]<\/code>

\u00a0 \u00a0 \u00a0 \u00a0 tool = meld<\/code>

[mergetool \"meld\"]<\/code>

\u00a0 \u00a0 \u00a0 \u00a0cmd = meld --diff \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\" --output \\\"$MERGED\\\"<\/code>\t<\/p>\n\n\n\t\tWhen you then launch the command using\t<\/p>\n\n\n\t\tgit mergetool\t<\/p>\n\n\n\t\tin a repository that needs merges, it\u2019ll automatically launch meld and pass it all the files.\t<\/p>\n\t\t\t<\/div>\n\t\t\t<\/div>\n\n\t\n\t