If
git pull
does not do the trick and if you want to merge both the current changes and the changes that'd come from the pull of the branch from origin then do this:-
git merge origin/BRANCH_NAME
After that, resolve the merge conflicts if any and done for the day.