Git merge 冲突时解决方式

最新推荐文章于 2021-09-30 16:20:33 发布

weixin_34007886

最新推荐文章于 2021-09-30 16:20:33 发布

阅读量176

点赞数

文章标签： git python 开发工具

原文链接：https://my.oschina.net/LucasZhu/blog/1550866

版权

2019独角兽企业重金招聘Python工程师标准>>>

//创建本地分支 制造冲突
Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2
$ git clone git@github.com:ZhuBaker/learngit.git .
Cloning into '.'...
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (20/20), done.
remote: Total 32 (delta 3), reused 30 (delta 1), pack-reused 0
Receiving objects: 100% (32/32), done.
Resolving deltas: 100% (3/3), done.

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git checkout -b feature
Switched to a new branch 'feature'

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (feature)
$ ls
abc.txt  dd  ddd.txt  READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (feature)
$ vim READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (feature)
$ git add READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (feature)
$ git commit -m 'feature'
[feature 62feb86] feature
 1 file changed, 1 insertion(+)
//切换到 master分支
Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (feature)
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ vim READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git add READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git commit -m 'master'
[master a1d0ee6] master
 1 file changed, 1 insertion(+)
//开始合并代码
Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git merge feature
Auto-merging READMYFILE
CONFLICT (content): Merge conflict in READMYFILE
Automatic merge failed; fix conflicts and then commit the result.

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master|MERGING)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   READMYFILE

no changes added to commit (use "git add" and/or "git commit -a")

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master|MERGING)
$ cat READMYFILE
add by master
feature
<<<<<<< HEAD
FFFF
=======
DDDD
>>>>>>> feature

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master|MERGING)
$ vim READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master|MERGING)
$ git add READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master|MERGING)
$ git commit -m 'merge'
[master d2ac9a9] merge

//测试已经合并成功
Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git merge feature
Already up-to-date.

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git push
Counting objects: 9, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (9/9), 926 bytes | 0 bytes/s, done.
Total 9 (delta 0), reused 0 (delta 0)
To github.com:ZhuBaker/learngit.git
   2360738..d2ac9a9  master -> master
//删除本地临时分支
Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git branch -d feature
Deleted branch feature (was 62feb86).

转载于:https://my.oschina.net/LucasZhu/blog/1550866