A Git helper tool that breaks large merges into parallelizable tasks
68 points by schusterfredl
by redoh
3 subcomments
We had a massive merge at work last year where two teams diverged for months on a shared codebase. It took three people a full week to resolve everything, and the worst part was stepping on each other's conflict resolutions. Splitting the merge into independent slices that people can work on in parallel would have saved us a lot of pain. The integration branch approach where non-conflicting changes land automatically is a nice touch too.
by schusterfredl
2 subcomments
mergetopus is a tool that helps teams follow a structured workflow for very large merges by splitting one risky merge into parallelizable tasks:
* one integration branch for trivial/non-conflicting merge results
* optional slice branches for selected conflicted files
* original annotate/blame information is retained
by spectrumx
1 subcomments
It's a good tool to solve a problem that, in truth, shouldn't be present at all in well-behaved engineering teams.
Hacker News