Git “error: The branch 'x' is not fully merged”

前端 未结 12 2053
忘了有多久
忘了有多久 2020-12-04 04:34

Here are the commands I used from the master branch

git branch experiment
git checkout experiment

Then I made some changes to my files, commi

12条回答
  •  一个人的身影
    2020-12-04 05:21

    Easiest Solution With Explanation (double checked solution) (faced the problem before)

    Problem is:

    1- I can't delete a branch

    2- The terminal keep display a warning message that there are some commits that are not approved yet

    3- knowing that I checked the master and branch and they are identical (up to date)

    solution:

    git checkout master
    git merge branch_name
    git checkout branch_name
    git push
    git checkout master
    git branch -d branch_name
    

    Explanation:

    when your branch is connected to upstream remote branch (on Github, bitbucket or whatever), you need to merge (push) it into the master, and you need to push the new changes (commits) to the remote repo (Github, bitbucket or whatever) from the branch,

    what I did in my code is that I switched to master, then merge the branch into it (to make sure they're identical on your local machine), then I switched to the branch again and pushed the updates or changes into the remote online repo using "git push".

    after that, I switched to the master again, and tried to delete the branch, and the problem (warning message) disappeared, and the branch deleted successfully

提交回复
热议问题