message no. 112209
Posted by wastrel in #github at 2015-09-15T19:05:37Z
anyway that's what i did. i then edited the file with the merge conflict. I assume i now add and check the changed file in ?
Posted by wastrel in #github at 2015-09-15T19:05:37Z