Git pull local and remote conflict

Commits like

local:  xxx -> some commit
remote: xxx -> yyy -> zzz

Now, git pull locally is not valid.

What to do?

Well you should git rebase, it rebases automatically