This article is really well written, and does a great job of introducing the problem all the way through to a really simple solution. I feel something like thi

This article is really well written, and does a great job of introducing the problem all the way through to a really simple solution. I feel something like this might be good as a first class citizen in git (it feels like a common problem, and I don't see how it's solved by some sort of Github feature)