how to reset develop branch to master

前端 未结 3 1622
陌清茗
陌清茗 2021-01-30 12:27

I have develop & master branches, my develop branch is messy now and i would like to reset it and make it as a copy of my master

3条回答
  •  灰色年华
    2021-01-30 13:08

    If you want to make develop be identical to master, the simplest way is just to recreate the pointer:

    git branch -f develop master
    

    Or, if you already have develop checked out:

    git reset --hard develop master
    

    Note however that both of these options will get rid of any history that develop had which wasn't in master. If that isn't okay, you could preserve it by instead creating a commit that mirrored master's latest state:

    git checkout develop
    git merge --no-commit master
    git checkout --theirs master .
    git commit
    

提交回复
热议问题