Merge form with upstream/developer

Hi all I want to merge my frappe fork with upstream/develop , I did

git checkout local_branch
git merge upstream/develop

It doesn’t merge all the file such as frappe/core/doctype/translation/ doesnt appear

I want to get all the new files that exists on the upstream and merge it with my local branch.
Any change to the solution?

What does this return

git remote -v