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

前端 未结 12 2034
忘了有多久
忘了有多久 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:09

    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

提交回复
热议问题