Skip to content

Relationship of 'base' and 'master'. #22323

Answered by Wabri
Texterity asked this question in New to GitHub
Discussion options

You must be logged in to vote

Hi @texterity,

The Github UI says it right “This branch is 39 commits behind master” , there are changes on master and not in the review branch so there are nothing to merge to master.

Assume the following history:

                      A review
                    /
               A—B---C—D master

The branch review is created from the commit A of master while master continue to grow with some more commits B C D. In the review branch will not be add any more commits. Now you want to merge review into master, but the master had already the commit A so the review is up-to-date with master. If you want the commits made on master you need to do the exact opposite: merge the master into review…

Replies: 2 comments

Comment options

You must be logged in to vote
0 replies
Answer selected
Comment options

You must be logged in to vote
0 replies
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants