如何更新我的本地 master 分支以包含对我的本地 feature 分支所做的更改，这些更改在 origin (remote) master 上是最新的？

Question

TLDR: My local feature branch has merged with remote origin/master, but my local master is not merging with remote master ("already up to date") and git pull/fetch doesn't work.

The origin/master (remote) repo that I can see on github that my team is working on is up-to-date and working. It includes everything from both my master branch and feature branch.

My local master branch is missing data from the feature branch and is behind my team's remote origin/master.

My local feature branch is ahead of my local master branch but behind the origin/master.

How do I synchronize my local branches to be at the same level?

When I git pull/fetch on my local master it says it's up to date, but it's not.

Why did this happen? Should I have only merged my local feature with my local master branch, and then only merge my local master with remote origin/master?

Edit: It seems like my branches have only pulled from remote/origin master when I have pushed my changes.

Answer 1

If you already merge your feature to master and don't have any missing changes on master, you can simple reset your master to origin. Go to master branch and try: git reset --hard origin/master .

I'm not sure why this happens, but already happened to me and I fix by this way.