Safer merge conflict resolution

When resolving a merge conflict on GitHub, you’ll now be warned before committing those changes into a default or protected branch.

Merge conflict confirmation

Learn more about merge conflicts on GitHub.

Have feedback on this post? Let @github know on Twitter.
Need help or found a bug? Contact us.

Changelog

Subscribe

GitHub Universe logo

GitHub Universe

October 16-17 in San Francisco
Get tickets today

Discover new ways to build better

Try Marketplace apps free for 14 days

Learn more