Github still shows differences between branches after sucessfull merge

后端 未结 2 1715
清酒与你
清酒与你 2021-01-14 06:58

Recently I merged a huge pull request (140 commits) from the feature branch to master:

I can see the merge in the github overiew on the master branch:

2条回答
  •  再見小時候
    2021-01-14 07:32

    as @matt is saying, you probably didn't merge but squashed or rebased or something. The best you can do then is rebase that single revision on top of the base branch:

    git checkout feature-branch
    git rebase --onto origin/the-base-branch feature-branch~ feature-branch
    

    That will put the branch on top of the base branch... you will probably have to force-push if you are using the same branch that you used before to create the PR because that history was not really merged into the base branch so a normal push will fail.

提交回复
热议问题