My friend Elyse is a chef in Sonoma County. I setup a website for her using Jekyll, GitHub for Windows, and Heroku. When she wants to update her website, she makes changes to Markdown files and clicks the “sync” button in GitHub for Windows to publish her changes. It works magnificently well … until it breaks, and GitHub for Windows is terrible at telling you what the error actually is.
After some searching I discovered the sync button performs two actions:
git pull --rebase
At some point
git pull --rebase failed and left behind a
.git/rebase-apply directory. In order to fix this, open the shell as the error message suggests and run the command:
Confirm that it should remove the entire folder, then close the shell. Retry the sync command and it should work.