« Minimal Reproducible »
Home Tags About GitHub

git-pull-local-and-remote-conflict

Published at 2024-03-28
 Last update over 365 days ago Licensed under CC BY-NC-SA 4.0 softwares-and-toolsgitpull

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