GitHub Pull Request Complex Conflicts

Question

GitHub added a feature about a month ago to resolve merge conflicts in the web interface, however it only works for "simple" merge conflicts:

No conflict

Simple conflicts

Difficult conflicts

In a post introducing a new feature, GitHub mentions competing line changes that can range from fairly simple to quite complex.

What qualifies as a conflict too complex to resolve in a web editor?

Answer 1

What qualifies as a conflict too complex to resolve in a web editor?

You!?!

Review the tensile request. If you think this is fairly simple and that there is no risk or regression or the need to run unit tests, try combining it.

Unfortunately, sometimes everything happens as we expect, and conflicts can arise: - (

If you can handle conflicts and perform a merge, that's fine.

Otherwise, ask them to reinstall, merge, or compile the commit and merge it locally. Do as you want ...