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.

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

Scott J. Goldman

@scottjg