3 ms·
One additional thing I would mention ist that: When resolving conflicts never try to solve them for the final result. Consider each conflict without considering
by LunicLynx 2mo ago
One additional thing I would mention ist that: When resolving conflicts never try to solve them for the final result. Consider each conflict without considering how the code will change in a later commit. I’ve seen people die a painful rebase death because of this.
- formerly_proven 2mo agorerere
- inigyou 2mo agothis is not a cat on a keyboard. it is the name of a git command that does this.
- chrysoprace 2mo agoYeah like the other commenter below mentioned, `rerere` takes a lot of the pain out of layering rebased changes. It's important (IMO) to make sure each commit still contains a logical change and a working system, even with an incremental rebase.