Merging changes from master into my branch

Question

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.

Because with the command that you provided `git branch custom_branch` you don't change to `custom_branch` just staying on `master`. Execute `git checkout custom_branch` and if the master have some changes in master after you created the `custom_branch` then if you want to merge the changes to your `custom_branch` execute `git merge master`. — IamK, Dec 08 '16 at 18:04
I already suggested this in my answer, but he seems to have an issue with git not recognizing changes. — tehp, Dec 08 '16 at 18:07
having the same issue. Have rebased and tried merging multiple times. git says up to date but the changes are not merging to my custom_branch. I can see the changes when i checkout the master branch. — Harshit Nagar, Nov 12 '20 at 08:17

score 188 · Accepted Answer · edited May 23 '17 at 10:30

188

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: When do you use git rebase instead of git merge?

edited May 23 '17 at 10:30

Community

1
1

answered Dec 08 '16 at 17:43

tehp

5,018
1
24
31

5

thanks, but I don't want to rebase since others are also using this branch. Also, running the second command says everything is already up to date. – Darth.Vader Dec 08 '16 at 17:52
5

@Darth.Vader have you ran `git pull` before attempting to merge? – tehp Dec 08 '16 at 17:59
After doing this I get this message "Updates were rejected because the tip of your current branch is behind hint: its remote counterpart." What should I do? – Ollie Williams Jul 04 '22 at 16:15

score 64 · Answer 2 · answered Oct 14 '21 at 18:29

64

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

answered Oct 14 '21 at 18:29

Tilman

734
5
10

1

This should be the accepted answer IMO – fig Jun 16 '23 at 09:47
Hi. Does this work if I switch to main first and pull? $ git checkout main $ git pull $ git checkout feature branch $ git merge main $ git push – TechNewbie Aug 17 '23 at 15:23

score 23 · Answer 3 · answered Nov 13 '20 at 16:24

23

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

answered Nov 13 '20 at 16:24

Darth.Vader

5,079
7
50
90

18

In the end I did `git pull origin master` – Cloud May 08 '21 at 14:33

Pritam Banerjee · Answer 4 · 2022-12-06T09:13:17.077

7

Just do:

git fetch origin master

And then do:

git merge master

edited Dec 06 '22 at 09:13

answered Dec 05 '22 at 22:48

Pritam Banerjee

17,953
10
93
108

score 3 · Answer 5 · answered Nov 14 '22 at 15:16

3

You probably still have to pull the changes to your local master branch. Before your commands, use git checkout master and then git pull

answered Nov 14 '22 at 15:16

Bob van den Berg

224
2
7

score 0 · Answer 6 · answered Feb 26 '23 at 19:46

0

Be sure that you're on the branch you want to merge into. Command for merging master into the

git merge master && git commit -m "merging master" && git push

answered Feb 26 '23 at 19:46

Lily

1
3

Merging changes from master into my branch

6 Answers6