One-click merge conflict resolution now in the web interface 🚀

[ebndev]

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.

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 this post. We'd love to get your feedback!

[haroonmaqbool]

This is a fantastic update, the one-click conflict resolution is a real time-saver! Having Accept incoming/current/both changes directly in the web interface makes quick fixes much smoother, especially for smaller teams or when working on mobile.

[dzienisz]

OMG, I’ve been waiting for this forever! Resolving conflicts on the web will be so much easier now.

[essicajayleigh-create]

[muspriandi]

This is a really nice update! 🎉
Being able to fix merge conflicts right in the browser makes work faster, especially for small or quick edits.
It’s a great improvement for developers who want to merge quickly and safely. Thanks to the team for adding this! 🙌