修改一个bug
login feature commint 1
ffff
zailai@!
register1
register2
stash pop
Merge branch 'release/v1.01' into develop
解决冲突
Merge branch 'develop' of https://github.com/KevinZuo86/git_workflow into feature/register

Conflicts:
	a.txt
啊啊
Merge branch 'feature/register' into develop
 rebase1
rebase2
make conflicts
Merge branch 'feature/rebase' of https://github.com/KevinZuo86/git_workflow into feature/rebase

Conflicts:
	a.txt