8 ms·
I don't understand the remark about the history. You can merge and "squash" your history into a single commit. I don't understand what rebase brings.
by shin_lao 14y ago
I don't understand the remark about the history. You can merge and "squash" your history into a single commit. I don't understand what rebase brings.
- merlincorey 14y agoIn addition to squash merging, you can merge without fast forwarding (--no-ff), which is a great method to make topical branches of related commits one single atomic conflict free commit.