[codeonfire]

Rebasing is similar to merging. Instead of merging their code after your code, you are merging your code after their code. So if the two versions modify the same code fifty commits apart you'll have conflicts in both cases.