A quick little update, showing off one of the best tools I’m currently paying for: Kaleidoscope. It’s saved me hours of time tackling merge conflicts, diffing results; and I’m finding new & exciting ways to use it. In this case: applying framework upgrades from one app into another!