+[2016-04-14T20:59:27Z]Trashlordnevermind, 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]VxJasonxVjmacdonald: put it in quotes, I think +[2016-04-14T23:05:19Z]VxJasonxV"your@email.addr" should work around the character exclusion
they'd need to have my public key, username and password in order to write
+[2016-04-15T14:29:30Z]wastrelhi +[2016-04-15T14:30:26Z]wastreli 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]selckingit mergetool +[2016-04-15T14:31:24Z]wastreli 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"