How do I 'overwrite', rather than 'merge', a branch on another branch in Git?

前端 未结 13 1379
广开言路
广开言路 2020-11-27 08:51

I have two branches, email and staging. staging is the latest one and I no longer need the old changes in email branch, y

13条回答
  •  [愿得一人]
    2020-11-27 09:40

    git checkout email
    git merge -m "Making email same as staging disregarding any conflicts from email in the process" -s recursive -X theirs staging
    

提交回复
热议问题