News for hackers. Stuff that matters.
Re:A Git helper tool that breaks large merges into paralleli... by rwmj on Friday April 17, 2026 @06:39AM (#47804459)
> where two teams diverged for months on a shared codebase

There's your problem. What was the reason for not merging small changes, bug fixes, refactors and such, early?

Re:A Git helper tool that breaks large merges into paralleli... by wren6991 on Friday April 17, 2026 @07:24AM (#47804721)
Brought to you by classics like "how do I join all of these pthreads that I've detached?"
Re:A Git helper tool that breaks large merges into paralleli... by _s_a_m_ on Friday April 17, 2026 @09:20AM (#47805631)
Yeah, that is a terrible idea. Before you do this, you'll first do a redesign and split things up in packages that can be separately updated and installed.