Resolve simple merge conflicts on GitHub
You can now resolve simple merge conflicts on GitHub right from your pull requests, saving you a trip to the command line and helping your team merge pull requests faster.…
You can now resolve simple merge conflicts on GitHub right from your pull requests, saving you a trip to the command line and helping your team merge pull requests faster.

The new feature helps you resolve conflicts caused by competing line changes, like when people make different changes to the same line of the same file on different branches in your Git repository. You’ll still have to resolve other, more complicated conflicts locally on the command line.
For more on merge conflicts and how to make them disappear on GitHub and on the command line, check out the GitHub Help documentation.
Written by
Related posts
How to navigate GitHub Universe (or any tech conference) if you’re an introvert
If alone time is your love language—don’t worry, it’s ours too—you can still attend, learn from, and enjoy big events like GitHub Universe. Here are some practical tips on how.
GitHub Availability Report: September 2025
In September, we experienced three incidents that resulted in degraded performance across GitHub services.
The developer role is evolving. Here’s how to stay ahead.
AI is changing how software gets built. Explore the skills you need to keep up and stand out.