Answer: master branch and 'origin/master' have diverged, how to 'undiverge' branches'?

You can review the differences with a:

git log HEAD..origin/main # old repositories git log HEAD..origin/master 

before pulling it (fetch + merge) (see also "How do you get git to always pull from a specific branch?")

Note: since Git 2.28 (Q3 2020), the default branch is configurable, and…