Sync main merges with github

It's common when working on a PR to merge in changes to the main branch via the UI, creating a merge commit. It would be great if `git-sync` would fast-forward those commits into the relevant branch, so that subsequent work on the branch is compatible.