github: One-click merge conflict resolution now in the web interface

GitHub added a one‑click merge conflict resolution feature to the github.com web interface, letting maintainers resolve pull request conflicts directly on the site when those conflicts are resolvable in the web editor.

• Source: GitHub