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.…
Scott J. Goldman
Posts by this author
Improving collaboration with forks
If you’ve ever wanted to make minor changes before merging a pull request, now you can. When a user opens a pull request from a fork, they’ll be given a…
Change the base branch of a Pull Request
You can now change the base branch of an open pull request. After you’ve created a pull request, you can modify the base branch so that the changes in the…
Upcoming IP address changes
As we expand our infrastructure, we are making changes to the IP addresses currently in use. If you are explicitly whitelisting GitHub in your firewall rules, please make sure that…
Branch and Tag Labels For Commit Pages
Have you ever looked at a commit page on GitHub and wondered what branch the commit was in? We did too. If the commit is not on the default branch,…
Surviving the SSHpocolypse
Over the past few days, we have had some issues with our SSH infrastructure affecting a small number of Git SSH operations. We apologize for the inconvenience, and are happy…