Comment by 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.