git has rerere for this usecase, jj doesn't - you have to find the conflict reso... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		Mic92 22 days ago \| parent \| context \| favorite \| on: Jujutsu at Google [video] 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.

steveklabnik 21 days ago [–]

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.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact