Skip to content

Posts by

Scott J. Goldman

@scottjg

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.…

An illustration of two octocats repairing a robot.

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…

An illustration of two octocats repairing a robot.

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…

An illustration of two octocats repairing a robot.

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…