Merging a huge git conflict

Both me and my colleague work separately working on same git tree while being offline for a couple of days. Result: following "git pull" I got a huge conflict spanning about 100 of files.

This meant that manual resolution is out of question. Enter "git mergetool" and "kdiff3". I installed kdiff3 from linuxpackages.net (version is for old Slackware 11.0, and I had to s ymlink /opt/kde/kdiff3 to /usr/bin/kdiff3 so that git finds it).

git-mergetool calls kdiff3 for each file, you merge and save. Job done very quickly.

Tweet to @mbabuskov Milan Babuškov, 2011-12-01