Steps to resolve Git merge conflict

 

This question already has an answer here:

  • How to resolve merge conflicts in Git? 32 answers

    • AFAICS, you want to keep the changes in develop and the changes in feature . I would prefer a rebase in this case since I want develop as the base for my feature branch and I just wish commit A from feature to be put on top of develop . 

    git checkout develop
git pull origin develop
git checkout feature
git rebase develop

# If any conflicts are here, you HAVE to look up what part of code you'd like to keep and what to discard.

    This will not ditch you.

    链接地址: http://www.djcxy.com/p/7224.html

    上一篇: 如何解决这种git冲突：.merge

    下一篇: 解决Git合并冲突的步骤