3 ms·
you can often solve this by squashing before rebasing.
by adgjlsfhk1 4y ago
you can often solve this by squashing before rebasing.
- MaxBarraclough 4y agoThat has its own problems. Separating whitespace-only reformatting commits from substantive commits makes it much easier to inspect the real changes, for instance. Also, more fine-grain commits can help you trace down a bug, perhaps with the help of git bisect. Once you've tracked down the commit that introduced the bug, things will be easier if that commit is small. Fortunately you can just merge from master, bringing your code back in sync with master without touching master itself. I see Beltalowda has mentioned this.
- IshKebab 4y agoYou mean you can often give up and avoid solving the problem by squashing before rebasing?
- erik_seaberg 4y agoReviewing a squashed branch is much harder than reviewing one set of closely related deltas, and then reviewing a different set of closely related deltas that happen to overlap.