I have been searching for a while for good tools to split/regroup diffs in a patch series. hunk.nvim looks interesting. Do you know of similar/competing tools?
I frequently hit a problem where removing a spurious hunk from an old commit causes cascading conflicts in all subsequent commits. Are there tools to propagate hunk removal into the future without the manual conflict-resolution pain?
Thanks again!
In my experience with jj when resolving a conflict, as long as I do it in the earliest change, I will only have to do it once.
Git has the rerere setting [0] which reduces the need to resolve the same conflict over and over
There's also the compact, simple alternatives to bulky receivers that are becoming available: Wiim amp, Sonos amp, Eversolo play, and the cheaper chinese makers like SMSL and Fosi. Each of those brands has a small device the size of an apple tv that will take an HDMI Arc input, and output an amplified signal to power some passive bookshelf speakers.