The top documents tagged [git merging]
Quick Introduction to git
4.184 views
Git primer
3.669 views
Why Git Sucks and you'll use it anyways
12.877 views