What is the easiest way to resolve conflicts on Github when doing a Pull Request

Question

I am trying to merge branches on GitHub via Pull Request, but I am getting conflicts.

What is the easiest way to solve the conflicts?

Answer 1

1. Use GitHub web editor.

2. You'll be presented with an editor, which will look like this:

Keep the changes that you want, and delete the rest (including the delimiters).

Assuming you want to keep the code from foo branch, this is how your code should look like after editing:

Using Prev and Next links, navigate to the next conflict:

Hit "Mark as Resolved", and optionally, repeat for other files:

Finally, when you're done resolving all files, a new button appears:

GitHub just introduced this new feature, and it simplifies resolving simple conflicts.

Docs are here: https://help.github.com/articles/resolving-a-merge-conflict-on-github/