not able to update local branch with master

Question

I created new branch: private/feature from bit bucket master branch and fetched it to my local using git fetch origin .

Now I'm done with my changes but I see there is some sync issue between my local branch and master branch ie some changes are present in master and not in my local which is causing compilation issues in sdk.

I tried - git pull origin master branch , Already up-to-date

but now I see Your branch is ahead of 'origin/private/feature' by 373 commits.

I also tried :

git stash 
Git pull
git stash pop

but still same issue

What's the best approach for these kinda issues ?

Answer 1

With git fetch do not combine changes into your actual branch.

You need to use since your branch private/feature: git merge origin master or git rebase origin master for bringging changes of master branch.