git-pull-local-and-remote-conflict

Commits like

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

Now, git pull locally is not valid.

What to do?

Well you should git rebase, it rebases automatically