Comment by blueplanet200

Reminds me of this article from way back, "A look back: Bram Cohen vs Linus Torvalds"

Of significance here because the resolution strategy from merges was deeply at the disagreement between Bram and Linus.

https://web.archive.org/web/20110728005409/http://www.wincen...