Hacker News Reader

[flagged]

> 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?

Brought to you by classics like "how do I join all of these pthreads that I've detached?"

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.

> We had a massive merge at work last year where two teams diverged for months on a shared codebase.

There is no tool in the world that can save you guys from yourselves. There is a reason why Agile methodologies put such a premium on continuous integration.

Reply on news.ycombinator.com