alt Hacker NewsI use rerere when "forced" by team to use rebase. It not even work that much at the end (you can't control workflows outside yourself, that is why git ux is wrong: it desperately need total discipline).
THEN, I move to jujutsu. Only has a few problems at start trying to use it as git, but after get the idea, all fine.
BTW, this was with the same team and they never know, so JJ is in fact better: It survive OTHERS workflows.
Replies
nchmy • today at 4:35 PM
No idea why this was downvoted. This is one of many ways in which jj is far better than raw dogging git
cub-creature • today at 5:07 PM
[dead]
You should not be seeing the same conflicts over and over again in a situation in which you are on a single branch, just rebasing your unpublished commits.
You might get conflicts regularly, if people are touching the same area of the code that you are touching, but not the same ones.
rerere mainly comes into play when people have to backport commits into multiple similar branches, due to having a heavily forked git landscape.