Updating your branch with the latest changes from master branch

Question

Suppose you make a branch called test from a called branch master . Then the master branch is updated with some changes. What is the best way to update your branch test with the latest master branch without overwriting your changes in test ?

Basically, I did the following:

git clone git@project.git 
git checkout -b test

Make changes to test . But now master has been updated. So when I do the following:

git add .
git commit -m "updated test"
git push origin test

it is working with the older version of master. How do I use the newest version?

You either merge or rebase. Let me find the dupe – knittl Dec 20 '21 at 17:59 — knittl, Dec 20 '21 at 17:59

Mureinik · Accepted Answer · 2021-12-21T10:16:14.070

2

You should rebase your branch on top of the remote master.

First, fetch the least changes:

git fetch origin

And then rebase your branch:

git rebase origin/master

edited Dec 21 '21 at 10:16

answered Dec 20 '21 at 18:00

Mureinik

277,661
50
283
320

Do I do this within the test branch? – stackguy1723 Dec 20 '21 at 18:00
You have to run these commands after checkout the test branch – Antoine Richard Dec 20 '21 at 18:06

score 0 · Answer 2 · answered Dec 20 '21 at 18:00

0

I think:

git pull origin master

answered Dec 20 '21 at 18:00

script0

292
7

Updating your branch with the latest changes from master branch

2 Answers2