3 ms·
Ok I see. I actually misunderstood what rebase actually did. So I guess it's a good thing then that I've never used it. Thanks for your persistence.
by recursive 6y ago
Ok I see. I actually misunderstood what rebase actually did. So I guess it's a good thing then that I've never used it. Thanks for your persistence.
- jfengel 6y agoRebase is useful for artificially straightening out simultaneous work. It's less clear in the above example, where d is just a single commit. But if there's a d1--d2--d3--d4, it can be confusing to merge chronologically (d1--d2--e--d3--f--d4). If there aren't any conflicts, it's conceptually simpler in the long run to rebase it as e--f--d1--d2--d3--d4. You artificially serialize the work, which isn't what actually happened, but it could have happened that way. When you go back and look at it, pretending that it did is simpler. For example, if you have to go back and debug something that happened while working on d1...d4. It's not absolutely mandatory to learn about it. But it the simple cases are common enough, and useful enough, that it's worth learning.
- pjc50 6y agoThat didn't stop you from arguing that it was trivial upthread...
- recursive 6y agoI was attempting to answer a question. It wasn't my intent to pose an argument.