News for hackers. Stuff that matters.

A comment on A Simple Explanation for Git Rebase.

Re:A Simple Explanation for Git Rebase by klochner on Wednesday April 16, 2014 @02:07AM (#7596348)
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.

[ Parent | on HN ]
Re:A Simple Explanation for Git Rebase by bradrobertson on Wednesday April 16, 2014 @07:58AM (#7597186)
Good call I'll update the post to mention resolving commits. This was not intended to enlighten those who already know how rebase works.
[ Parent | on HN ]