1
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 of files.
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1
上面是当前分支部分,下面是合并进来的分支部分
改完保存,
然后git add .
git status查看
git commit -am '注释'
git push
提交即可