Back in the early 2010s I often found myself trying to merge code that had been refactored on one branch and had new functionality added or existing code changed on another. So subclasses being hoisted, methods being extracted, methods being sorted by visibility, code being packaged up into clas...
Source: [Hacker News](https://github.com/sageserpent-open/kineticMerge)