Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by Mic92 on Friday October 31, 2025 @04:15AM
(#45769487)
git has rerere for this usecase, jj doesn't - you have to find the conflict resolution manually in your history in this case if you made a mistake.
[ Parent
| on HN ]
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by steveklabnik on Friday October 31, 2025 @11:35AM
(#45773240)
git has rere, but jj doesn't because its equivalent is built in. https://github.com/jj-vcs/jj/issues/175#issuecomment-1079831... is some discussion about the differences here.