+ [2016-02-19T05:35:10Z] arunK juneja bhai btao kuch
+ [2016-02-19T05:37:57Z] arunK hello infra-red
+ [2016-02-19T06:59:05Z] VxJasonxV sagerdearia: if you authenticate, that's raised to 5000
+ [2016-02-19T06:59:08Z] VxJasonxV MarkusDBX: no

message no. 124094

Posted by i-make-robots in #github at 2016-02-19T04:45:05Z

hi github. I'm stupid and I don't know how to resolve a merge conflict. My code's all up to date and the diffs have been fixed, but github GUI on windows still tells me to open a terminal and poke it. Can you please point me to a step-by-step so I don't kaboom this?
+ [2016-02-20T10:25:47Z] Lirux When I want to make a pull request and I edit a file in a forked repo, should I make the change on master or different branch?
+ [2016-02-20T10:29:45Z] sim642 Lirux, a different branch would be a better idea
+ [2016-02-20T10:30:00Z] sim642 then you can do multiple separate changes and open separate pull requests for them
+ [2016-02-20T10:30:11Z] sim642 whereas when making all the changes one after another on master wouldn't
+ [2016-02-20T10:30:19Z] sim642 it's just be adding extra things to the PR as well