17 March 2017 Git Your Differences Settled Dealing with git merge conflicts and trying to figure out which side of ======== was the new code …