https://speakerdeck.com/jaramir 2013-09-23 07:52:37 -0400 An introduction to the workflow for solving merge conflicts with Git An introduction to the workflow for solving merge conflicts with Git Thu, 22 Nov 2012 00:00:00 -0500 https://speakerdeck.com/jaramir/merge-conflicts-with-git https://speakerdeck.com/jaramir/merge-conflicts-with-git