ProductResolve simple merge conflicts on GitHubYou 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
![Resolve simple merge conflicts on GitHub](https://cdn-ak-scissors.b.st-hatena.com/image/square/99f7e5046734c4ecff415468c1f10899e6856e54/height=288;version=1;width=512/https%3A%2F%2Fgithub.blog%2Fwp-content%2Fuploads%2F2016%2F12%2Ffd64b010-c06b-11e6-9dd3-a827e299c5bf.gif)