Resolve GitHub Merge Conflicts

Описание: If a file has been updated in two separate branches, you'll have yourself a GitHub merge conflict to resolve. Merge conflict resolution in GitHub can be done at the command line, but it can also be done in the web editor.

In this quick GitHub Merge Conflict Resolution example, we'll show you how to create a merge conflict in GitHub, how to initiate a merge request, and how to generate a new commit that will finally fix and resolve the GitHub merge conflict for good.

Some advice? It's a best practice to avoid GitHub merge conflicts completely. Don't let your developers work on the same piece of code in different branches if it can be avoided. Git and GitHub merge conflict resolution is not fun.