git add .
:他会监控工作区的状态树,使用它会把工作时的所有变化提交到暂存区,包括文件内容修改(modified)以及新文件(new),但不包括被删除的文件。即提交新文件(new)和被修改(modified)文件,不包括被删除(deleted)文件
$ git add .
提交本地分支
$ git commit -m 'lry'
[master 50f8f84] lry
$ git pull origin master
remote: Counting objects: 42, done.
remote: Compressing objects: 100% (27/27), done.
remote: Total 42 (delta 13), reused 40 (delta 12)
Unpacking objects: 100% (42/42), done.
From ***
* branch master -> FETCH_HEAD
5f38cd9..e4dc95f master -> origin/master
Auto-merging ***.java
Auto-merging ***.java
CONFLICT (content): Merge conflict in ***.java
Auto-merging ***.java
Automatic merge failed; fix conflicts and then commit the result.
接下来就是自己解决冲突了