4 ms·
I rebase on my topic branches because then my edits are neatly stacked on top of the other branch, so I can re-arrange things more easily. Why would I want a we
by ok_dad 4y ago
I rebase on my topic branches because then my edits are neatly stacked on top of the other branch, so I can re-arrange things more easily. Why would I want a weird commit with a bunch of work I didn't do on the topic just smooshed into the middle of my well-crafted series of commits?
- mixmastamyk 4y agoWork you didn't do won't be in your branch. There is no rearranging, it is one commit.
- Dylan16807 4y ago> Work you didn't do won't be in your branch. The merge commit will be in the branch. > There is no rearranging, it is one commit. You misread that. They want to be able to rearrange things easily. Having multiple merge commits in the middle gets in the way of that.
- mixmastamyk 4y agoThe work doesn't show up on a diff, what I was getting at. Merges are from master in this example and already reconciled. Commits don't matter either, because they are being squashed. Was responding to the grandparent perhaps more than the parent.