Scott Taylor

> Edit: reading it again, I guess you are saying diff instead of snapshot, when before all I saw was first instead of first. Yes, that is what I intended....

> FWIW, I'm not attached to the idea of even trying to pick the smaller diff. Would it be even better in your mind if we always picked the first...

I think #7917 would probably be a better option than this so I'm closing this PR in favor of that issue

Those could be good names! I think it is technically not possible to modify the change ID without also modifying the commit ID because of how the change ID is...

Hey @martinvonz, could you take a look and let me know your thoughts on this approach when you get a chance?

> Note that this PR seems to implement it a bit differently than [what I suggested on #1176 ](https://github.com/jj-vcs/jj/issues/1176#issuecomment-2908421911). My suggestion there was to record a label associated with each...

> Also I suggest that if bookmarks are used they show optionally, names are more descriptive than numbers. Yeah, that would definitely be nice. I'm thinking it would be a...

I think this is ready for review now; I updated it to abandon the commits before starting the rebase and added tests.

@yuja Your other PR made the code a lot simpler, thanks! I haven't had much time recently, but I'm hoping to address the comments soon.

Hmm I just tested it after merging, and I found a bug immediately (I think I forgot to test this case previously because I was too focused on testing the...