You can now resolve merge conflicts directly in the github.com web interface with a single click.

When a pull request has merge conflicts that can be resolved in the web interface, you’ll see new Accept incoming changes, Accept current changes, and Accept both changes buttons in the web editor. These actions, familiar to users of code editors like Visual Studio Code, make it easier and faster to resolve conflicts without leaving your browser.

A code editor in the web UI showing options to accept current changes, accept incoming changes, and accept both changes

Editor’s note (October 2, 2025): Updated the image demonstrating the web UI.

How does it work?

When a PR has merge conflicts, you’ll see clear conflict markers and the new one-click resolution buttons.

  • Accept current changes keeps the changes from the current working branch.
  • Accept incoming changes uses the changes from the base branch.
  • Accept both changes combines both sets of changes in the file.

This update brings the productivity and convenience of popular code editors’ merge tools directly to your github.com workflow—no context switching required.

How you can help

If you run into issues or have any feedback, feel free to drop a comment in our Community discussion.