"在dev下修改的"
Merge branch 'master' of github.com:kwx/first into dev
在dev上修改test.txt
dev 修改
在master上修改
commit dev上面的修改
修改冲突
on dev modify
Merge branch 'dev'