added 怎么把分支push上去？
有冲突了
merged changes from dev and resolved conflicts
Merge branch 'master' of https://github.com/ivandova/LearnGIT

因为另外一个人改了远程库啊。。