Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
test 第二次提交到远程
创建了新的分支
测试解决冲突2
测试解决冲突了
分支管理策略
git stash

bug修改成功，提交