3 ms·
Rebasing would be so much better if Git just had better defaults. Having to fix the same merge conflict for each of your commits is one of the leading causes o
by aeternum 3y ago
Rebasing would be so much better if Git just had better defaults.
Having to fix the same merge conflict for each of your commits is one of the leading causes of developer burnout :D
- jauntywundrkind 3y agoYeah it can be a bit of a pain. If you have long running branches or do keep hitting having to re-resolve, getting good at git rerere is recommended; "reuse recorded resolution"! https://hn.algolia.com/?q=git+rerere https://hn.algolia.com/?q=git+rerere
- cplusplusfellow 3y agoI’ve known developers who left the company over the rebase mandate for this exact reason.
- o11c 3y agoRebasing generally doesn't require repeated merge conflicts though? Since the formerly conflicting commit disappears and the non-conflicting one is now baked into a linear history. Regardless, `git rerere` is supposed to solve that problem, but I don't do enough conflicting merges to be intimately familiar with it in practice.
- mrkeen 3y agoSquash before rebase?