Git and “The branch 'x' is not fully merged” Error

问题:

Here are the commands I used from the master branch

git branch experiment git checkout experiment 

Then I made some changes to my files, committed the changes, and pushed the new branch to GitHub.

git commit . git push -u origin experiment 

Note that after git commit . I was prompted for a commit message, and I gave it one. Later on I decided to merge my experiment branch into the master branch.

git checkout master git merge experiment 

Finally I pushed the changes to GitHub.

git push -u origin master 

All went well until I tried deleting my experiment branch using

git branch -d experiment 

I got the error message error: The branch 'experiment' is not fully merged. I'm a bit new to git, and I don't know how much more I could possibly merge the two branches. What am I missing here?

回答1:

^{Note Wording changed in response to the commments. Thanks @slekse}
That is not an error, it is a warning. It means the branch you are about to delete contains commits that are not reachable from any of: its upstream branch, or HEAD (currently checked out revision).

In practice it means that you probably amended, rebased or filtered commits and they don't seem identical.

Therefore you could avoid the warning by checking out a branch that does contain the commits that you're about un-reference

You will want to verify that you in fact aren't missing any vital commits:

git log --graph --left-right --cherry-pick --oneline master...experiment 

This will give you a list of any nonshared between the branches. In case you are curious, there might be a difference without --cherry-pick and this difference could well be the reason for the warning you get:

--cherry-pick

Omit any commit that introduces the same change as another commit on the "other side" when the set of commits are limited with symmetric difference. For example, if you have two branches, A and B, a usual way to list all commits on only one side of them is with --left-right, like the example above in the description of that option. It however shows the commits that were cherry-picked from the other branch (for example, "3rd on b" may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output.

---

git-branch command does not check the revision tree of all branches. The warning is there to avoid obvious mistakes.

回答2:

As Drew Taylor pointed out, branch deletion with -d only considers the current HEAD in determining if the branch is "fully merged". It will complain even if the branch is merged with some other branch. The error message could definitely be clearer in this regard... You can either checkout the merged branch before deleting, or just use git branch -D. The capital -D will override the check entirely.

回答3:

I had this happen to me today, as I was merging my very first feature branch back into master. As some said in a thread elsewhere on SO, the trick was switching back to master before trying to delete the branch. Once in back in master, git was happy to delete the branch without any warnings.

回答4:

I tried sehe's answer and it did not work.

To find the commits that have not been merged simply use:

git log oldbranch ^newbranch --no-merges 

回答5:

Git is warning that you might lose history by deleting this branch. Even though it would not actually delete any commits right away, some or all of the commits on the branch would become unreachable if they are not part of some other branch as well.

For the branch experiment to be “fully merged” into another branch, its tip commit must be an ancestor of the other branch’s tip, making the commits in experiment a subset of the other branch. This makes it safe to delete experiment, since all its commits will remain part of the repository history via the other branch. It must be “fully” merged, because it may have been merged several times already, but now have commits added since the last merge that are not contained in the other branch.

Git doesn’t check every other branch in the repository, though; just two:

1. The current branch (HEAD)
2. The upstream branch, if there is one

The “upstream branch” for experiment, as in your case, is probably origin/experiment. If experiment is fully merged in the current branch, then Git deletes it with no complaint. If it is not, but it is fully merged in its upstream branch, then Git proceeds with a warning seeming like:

warning: deleting branch 'experiment' that has been merged to 'refs/remotes/origin/experiment', but not yet merged to HEAD. Deleted branch experiment (was xxxxxxxx). 

Where xxxxxxxx indicates a commit id. Being fully merged in its upstream indicates that the commits in experiment have been pushed to the origin repository, so that even if you lose them here, they may at least be saved elsewhere.

Since Git doesn’t check other branches, it may be safe to delete a branch because you know it is fully merged into another one; you can do this with the -D option as indicated, or switch to that branch first and let Git confirm the fully merged status for you.

回答6:

to see changes that are not merged, I did this:

git checkout experiment git merge --no-commit master  git diff --cached 

Note: This shows changes in master that are not in experiment.

Don't forget to:

git merge --abort 

When you're done lookin.

回答7:

I did not have the upstream branch on my local git. I had created a local branch from master, git checkout -b mybranch . I created a branch with bitbucket GUI on the upstream git and pushed my local branch (mybranch) to that upstream branch. Once I did a git fetch on my local git to retrieve the upstream branch, I could do a git branch -d mybranch.

回答8:

You can simply figure out :

git log --cherry master...experimental

--cherry option is a synonym for --right-only --cherry-mark --no-merges

git-log man page said

it's useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with git log --cherry upstream...mybranch, similar to git cherry upstream mybranch.

FYI. --cherry-pick omits equivalent commits but --cherry-marks doesn't. It's useful to find rebase and force updated changes between upstream and co-working public branch

回答9:

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

文章来源: Git and “The branch 'x' is not fully merged” Error