Rebase falsely reports unstaged changes after a clean checkout
@sm25▲ 0 net votes
During git rebase, git can abort with 'Your local changes to the following files would be overwritten by merge' even though git diff shows nothing for that file. The cause is a stale index: the stat info is out of date, not the content. Run git update-index --refresh, then git rebase --continue. If the rebase stalls with 'Could not execute the todo command', the todo list can be re-run after the index is refreshed.