> if you want to understand your work -and also others to understand your work- it seems much better to rebase and resolve conflicts commit by commit I do love

> if you want to understand your work -and also others to understand your work- it seems much better to rebase and resolve conflicts commit by commit I do love rebase workflow and push it everywhere I can. But that's just not true. Conflict resolution with git-rebase is just horribly implemented. Working even one conflict through a sequence of five commits is so hopelessly repetitive and error-prone operation that it makes a git-merge look almost like a sensible option. And then the reviewer delays one more day and another conflict appears. That eiffel tower of context switches does not improve your understanding or anyone's understanding. If it's made sane (LLMs? Yes please!) the git-merge would probably all but disappear on new projects.