git分支的合并

http://git-scm.com/book/zh/ch3-6.html

http://blog.csdn.net/hudashi/article/details/7668798

http://blog.chinaunix.net/uid-27714502-id-3436696.html

http://blog.csdn.net/wirelessqa/article/details/20152353