Apologies to GitHub if I’m wrong, but I wanted to mention a problem with the implementation of conflict resolution in GitHub.
If I recall when we resolve pull request merge conflicts inside GitHub the commit that contains the resolve changes gets committed to the “from” branch.
This is fine for pull requests that are merging project and feature branches to master but it is a problem when mergin from master to other branches.
Doing such merges modifies master and can have unexpected consequences if you’re not expecting that, anyone who pulls from master after the PR is merged will see this commit and it can cause problems/confusion.
I reported this on March 14, 2017 and got a reply from @lecoursen and do not know what the current status is - again, apologies if I have this wrong.