What I usually do in this case is:
Starting by a clean branch
create and switch to a new branch in local
git checkout -b test
set the new branch to track the remote desired one
git branch --set-upstream-to=origin/test test
pull the remote one
git pull