[klochner]

simple but unenlightening - I guess you hope no one asks you what's really happening and just give up if you get a conflict.

It's not that complicated - rebase applies your commits to another branch as if they were patches. Interactive rebase gives you the option of re-ordering/removing/editing those patches before they're applied.

[bradrobertson]

Good call I'll update the post to mention resolving commits. This was not intended to enlighten those who already know how rebase works.