Github pull request with conflicts, command line

Resolving pull requests that can't be merged automatically, using the command line

• #education
• #github
• #pull_request
• #merge_conflict