git拉取远端分支并与本地分支合并

1.提交代码到本地库

wsy@ubuntu:~/Desktop/se-CourseSelect$ git status
wsy@ubuntu:~/Desktop/se-CourseSelect$ git add .
wsy@ubuntu:~/Desktop/se-CourseSelect$ git commit -m \"自定义自己的更改信息\"

2.拉取远端的库（这里发现了冲突）

wsy@ubuntu:~/Desktop/se-CourseSelect$ git fetch origin master  [示例1：获取远端的origin/master分支]
wsy@ubuntu:~/Desktop/se-CourseSelect$ git log -p master..origin/master [示例1：查看本地master与远端origin/master的版本差异]
wsy@ubuntu:~/Desktop/se-CourseSelect$ git merge origin/master  [示例1：合并远端分支origin/master到当前分支]
Auto-merging db/schema.rb
CONFLICT (content): Merge conflict in db/schema.rb
Auto-merging config/routes.rb
Auto-merging app/views/shared/_sidenav.html.erb
Auto-merging app/controllers/courses_controller.rb
CONFLICT (content): Merge conflict in app/controllers/courses_controller.rb
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Automatic merge failed; fix conflicts and then commit the result.

3.查看冲突文件（这里有三个）

wsy@ubuntu:~/Desktop/se-CourseSelect$ git status
Unmerged paths:
  (use \"git add <file>...\" to mark resolution)

	both modified:   Gemfile.lock
	both modified:   app/controllers/courses_controller.rb
	both modified:   db/schema.rb

4.修改冲突的方法

wsy@ubuntu:~/Desktop/se-CourseSelect$ vim 查看分支文件
<<<<<<< HEAD
自己的代码
=======
远端的代码
>>>>>>> xxxxxxxxxxxxxxxxxxxxxxx
分析：head 到 =======里面的lalala是自己的commit的内容，=========到 >>>>>>里面的hehehe是远端的内容，根据需要合并代码就行了，别忘了把<<<<<<<    =======      >>>>>>都删掉

5.重新add commit push

wsy@ubuntu:~/Desktop/se-CourseSelect$ git add .
wsy@ubuntu:~/Desktop/se-CourseSelect$ git commit -m \"自定义自己的更改信息\"
wsy@ubuntu:~/Desktop/se-CourseSelect$ git push