News for hackers. Stuff that matters.

A comment on Jujutsu for Busy Devs. Parent comment

Re:Jujutsu for Busy Devs by notmywalrus on Tuesday July 22, 2025 @08:27AM (#44646032)
I would call `jj absorb` a new feature (new if coming from git, I believe the idea was taken from hg). It moves diffs into the closest ancestor that touched those files/lines. Very useful for addressing reviews, then just `jj absorb` and watch them get squashed into the correct location.

This gets even better with octopus merges (known in the jj community as "megamerges"): open up 5 branches at the same time, address minor tweaks in any number of them, and `jj absorb` the content into the right parent branch.

[ Parent | on HN ]
Re:Jujutsu for Busy Devs by 1718627440 on Tuesday July 22, 2025 @08:39AM (#44646139)
I do use git absorb, but its true, you have to install it.

I have never tried git absorb across merges, no clue if that works.

[ Parent | on HN ]
Re:Jujutsu for Busy Devs by Filligree on Thursday July 24, 2025 @06:15AM (#44669002)
It does not, or at least not very well. Merges can't be rebased without replaying conflict resolution; since Git lacks a first-class concept of conflicts, that becomes a manual process.

Moreover, jj should be able (I haven't explicitly tried this) to autogenerate the conflict resolution in the `jj absorb` case, since it knows what the final post-merge state should be.

[ Parent | on HN ]