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. git checkout 其实是用版本库里的版本替换工作区的版本 Creating a new branch is quick. <<<<<<< HEAD Creating a new branch is quick & simple. ======= Creating a new branch is quick and simple. >>>>>>> feature1 Switched to a new branch 'dev' git commit 命令后不能退出来，使用ESC 然后大写字母Z 连续按2下 add an newline add new line