2 ms·
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.
by 1718627440 1y ago
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.
- Filligree 1y agoIt 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.