Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes.
新增一行
<<<<<<< HEAD
<<<<<<< HEAD
Creating a new branch is quick AND simple.

master 新增
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple
Creating a new branch is quick AND simple..
>>>>>>> feature1


Creating a new branch is quick and simple.
=======
Creating a new branch is quick.
我是修改的
>>>>>>> dev
dd
现在修复bug，需要把“Git is free software .
..”改为“Git is a free software ...”，然后提交