Posts about merge RSS feed 2013-06-13 14:23An example to abuse the git merge 2013-06-10 21:08Use vimdiff to resolve git/subversion/mercurial merge conflicts effectively