branch commit
add return 1;
commit
Merge branch 'branch1'
Merge HEAD, branches 'master' and 'master' of https://github.com/zoudaokou2006/demo
Merge branch 'master' of https://github.com/zoudaokou2006/demo