@kjtten @umsi You are very close - the question was "What do you do when a "git pull" goes wrong and ends up with the urge to merge?" :)

5:49pm February 13th 2014 via web in reply to kjtten