The top documents tagged [git merging]
Quick Introduction to git
4.194 views
Git primer
3.672 views
Why Git Sucks and you'll use it anyways
12.887 views