Changed the .gitignore back again. It seems there is no hope to get this rebase working.