Merging changes from master into my branch

GitGithubVersion ControlGit Merge

Git Problem Overview


I have two branches in git: master and custom_branch.

Somebody added some code to master that I need to use in my custom_branch. I tried this:

git branch custom_branch
git merge master

But when I do that, it says:

Already up-to-date.

But, when I compare master and custom_branch, the changes are still not there. What am I missing?

P.S. I don't want to rebase since other people also use this branch.

Git Solutions


Solution 1 - Git

git checkout custom_branch && git rebase master

This will update custom_branch with changes from master branch.

Don't forget to make sure master is up to date first. git pull


This is also possible with git checkout custom_branch && git merge master


For an explanation on why the first one is (probably) what you should be using: https://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge

Solution 2 - Git

Answering my own question but to pull changes from upstream's master into my custom branch I did this:

git pull [URL TO UPSTREAM'S REPO] master

Solution 3 - Git

git merge master will update your current branch with the changes from your local master branch, the state of which will be that of when you last pulled while on that branch.

I think this is what you are looking for: git merge origin master

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
QuestionDarth.VaderView Question on Stackoverflow
Solution 1 - GittehpView Answer on Stackoverflow
Solution 2 - GitDarth.VaderView Answer on Stackoverflow
Solution 3 - GitTilmanView Answer on Stackoverflow