Git产生冲突
当我们进行合并分支往往会产生冲突。在准备新的feature1分支，继续我们的新分支开发
$ git checkout -b feature1 修改readme.txt最后一行，改为Creating a new branch is quick AND simple.
在feature1分支上提交
$ git add readme.txt $ git commit -m "AND simple" 切换到master分支
$ git checkout masterSwitched to branch 'master'Your branch is ahead of 'origin/master' by 1 commit. Git还会自动提示我们当前master分支比远程的master分支要超前1个提交。
在master分支上把readme.txt文件的最后一行改为Creating a new branch is quick & simple.提交：
$ git add readme.txt $ git commit -m "& simple"
页:
[1]