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
GitHub Universe 2026: Evolving every layer of the stack
Today, we laid out our vision for GitHub as the most comprehensive, end-to-end software delivery system in the world.
Octoverse: Commits, pushes, reach new highs in 2026 as developers build with agents
See how a record year of growth reached every industry, every field, and every kind of builder in the 2026 Octoverse report.
The next developer interface is ambient intelligence
AI, agents, voice, and physical controls are shifting software development from operating tools to expressing intent—and helping developers stay focused on building.