Five advanced Git merge techniques Sep 12, 2010 http://blog.ezyang.com/2010/01/advanced-git-merge/ Share this article: devops git