How to perform merge?

后端 未结 4 1647
傲寒
傲寒 2021-01-14 20:38

I have a master branch and a feature branch. The feature branch has several changes but the master branch has many changes like removing 10 projects from the repository. The

4条回答
  •  佛祖请我去吃肉
    2021-01-14 20:50

    I would rebase feature on top of master, then fast-forward feature on top of master

    (with feature checkedout)

    git rebase master
    

提交回复
热议问题