message no. 112206
Posted by wastrel in #github at 2015-09-15T19:04:00Z
hi i am trying to merge with conflicts on command line, github tells me to 1. git fetch origin; git checkout -b branch-name origin/branch-name; git merge master
Posted by wastrel in #github at 2015-09-15T19:04:00Z