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
We need a European Sovereign Tech Fund
Open source software is critical infrastructure, but it’s underfunded. With a new feasibility study, GitHub’s developer policy team is building a coalition of policymakers and industry to close the maintenance funding gap.
GitHub Availability Report: June 2025
In June, we experienced three incidents that resulted in degraded performance across GitHub services.
From pair to peer programmer: Our vision for agentic workflows in GitHub Copilot
AI agents in GitHub Copilot don’t just assist developers but actively solve problems through multi-step reasoning and execution. Here’s what that means.