+ [2016-04-14T20:59:27Z] Trashlord nevermind, I got it, thanks anyway :)
+ [2016-04-14T21:02:24Z] tang^ that one is read only, but they're free to fork it and work on their own copy
+ [2016-04-14T21:02:34Z] tang^ ewps
+ [2016-04-14T23:05:09Z] VxJasonxV jmacdonald: put it in quotes, I think
+ [2016-04-14T23:05:19Z] VxJasonxV "your@email.addr" should work around the character exclusion

message no. 131551

Posted by Trashlord in #github at 2016-04-14T20:59:27Z

nevermind, I got it, thanks anyway :)
+ [2016-04-15T14:30:26Z] wastrel i have a merge conflict and it is hateful to me and i want to get rid of it but i don't understand what the instructions are doing
+ [2016-04-15T14:31:18Z] selckin git mergetool
+ [2016-04-15T14:31:24Z] wastrel 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
+ [2016-04-15T14:31:28Z] wastrel "