Slacker News Slacker News logo featuring a lazy sloth with a folded newspaper hat
  • top
  • new
  • show
  • ask
  • jobs
Library

Comment by 1718627440

4 months ago

> Git records merge resolutions and can reuse them, but it doesn't do the same thing for rebases

Since when does rerere not work with rebase anymore?

2 comments

1718627440

Reply

tcoff91  4 months ago

I think it does but rerere is not nearly as good as first class conflicts in jj

  • 1718627440  4 months ago

    Ok, but by that measure,

    >> Git records merge resolutions

    isn't true either.

Slacker News

Product

  • API Reference
  • Hacker News RSS
  • Source on GitHub

Community

  • Support Ukraine
  • Equal Justice Initiative
  • GiveWell Charities