message no. 131587
Posted by wastrel in #github at 2016-04-15T14:31:24Z
i have a commit that's 4 files, one line of one file is the merge conflict. I follow the instructions "git fetch origin; git checkout -b branch_name origin/branch_name; git merge master