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

 help



Not really very similar at all for the scenario discussed here. Rerere remembers how you have resolved a conflict before. It doesn't let you rebase a stack of commits that result in different conflicts. You will have to stop and resolve each conflict and then `git rebase --continue`.

However, the conflict algebra does remove many common uses of rerere. See https://github.com/jj-vcs/jj/issues/175#issuecomment-1079831... for a longer discussion.




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

Search: