Scaling merge-ort across GitHub

GitHub switched to performing merges and rebases using merge-ort. Come behind the scenes to see why and how we made this change.