Simply Explained : git

Just as I am posting this, a colleague asks me how to resolve a conflict in git.  Hilariously well timed.

Via geek & poke.