I’ve had a few issues recently with git rebase failing intermittently when there are clearly no conflicts; if you run git rebase –abort and then try the rebase again it often succeeds. It appears that this can happen when Xcode is running in the background, as described in this discussion; the problem is that an…