HN Explorer

5 comments

[ 0.84 ms ] story [ 23.0 ms ] thread
schusterfredl
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

iamjs
I have long wanted a tool to help split large diffs into smaller semantic changes. When you're working on a feature, for example, and end up refactoring along the way, you may wish to have your refactor reviewed and merged without any new functionality.
locknitpicker
> * one integration branch for trivial/non-conflicting merge results

Doesn't this mean the integration branch will be missing key updates, thus it's expected to be broken?

[dead] redoh
[flagged]
spectrumx
It's a good tool to solve a problem that, in truth, shouldn't be present at all in well-behaved engineering teams.