如何用我从本地存储库的主分支派生的原始存储库更新派克的本地分支？

Question

Suppose i clone from a repository foo

I get a local copy name my/foo

I then create a branch mybranch/foo . Then i made some commits into mybranch/foo while some PR's get merged in foo remote repository( remote repository ) . I wan to merge my local branch mybranch/foo into foo but to do this i have to get all those changes which have taken place in foo while retaining changes which i have made in mybranch/foo .

I have tried using git rebase upstream/master and git merge upstream/master but i have not got the desired result . but i have not got the desired result . Above methods work for master of local repository but not for mybranch/foo . I want to know the best way of doing this .

Answer 1

git pull is what you are looking for:

git pull origin master

read this for more details.