gitLearning learn git knowledge. 1.test1 2.git branch, switch to dev 3.4. master and feature1 branch are merged manually. 2016.03.24 3.branch. 4.branch, merge --no-ff(fix a bug in bugFix branch, with git stash) 5.in test3 branch, 9:34. a.m.