花美男为中国互联网事业而奋斗

how to resolve conflict with git mergetool

来源:未知 阅读(0)次 评论(0)


git pull --rebase

when .png

you can use 'git mergetool' to resolve this problem.

git mergetool

mergetool.png

(first you should confinge your mergetool...)

when you resolve this problem, you can see now git status.

status.png

 and remove all of *.orig untracked files. 

status2.png

now we resolve all conflicts, we can run "git rebase --continue"

git rebase --continue

resolve.png


here,we can push our commit to git server.

git push   # or git push

git push.png


video : Fix merge conflicts in GiT

标签:gitmergetool
上一篇:Git 工作流程 下一篇:git tool - gitk

相关推荐