Adam Wathan on Twitter: "Here's a Git thing that has been driving me nuts for years that I don't understand. Hit a conflict when rebasing. Fix the conflict, `git add` the changed file, then `git rebase --continue` says I didn't do anything! What am I doing wrong
Most useful Git commands - Test Automation Chronicles
github - What if I rebase git branch on itself? - Stack Overflow