git-8_Merge conflict resolve

最新推荐文章于 2025-03-30 10:08:42 发布

zhanghuanhuanzhh

最新推荐文章于 2025-03-30 10:08:42 发布

阅读量477

点赞数

CC 4.0 BY-SA版权

分类专栏： git 文章标签： git conflict

本文链接：https://blog.youkuaiyun.com/zhanghuanhuanzhh/article/details/88720311

git 专栏收录该内容

25 篇文章

订阅专栏

test@etos20:[~/ers]((no branch))$merge conflict result enter no branch
$git mergetool    # run this command in VNC for merge conflict
$git rebase –continue #after problem resolved
$git rebase –skip     #skip this conflict patch
$git rebase –abort    #check out the original branch and stop rebasing