git pull should treat github (upstream) as the Single source of truth

[horner]

Currently git pull does a reset automatically.

https://github.com/mieweb/wikiGDrive/blame/3a64088186c4cf2a81271d759a847f725271a381/src/git/GitScanner.ts#L89

Push:

• Try pushing with rebase
  • if fails: Alert... allow reset hard as a button to remote master Pull
• Try pull with rebase
  • if fails: Alert... allow reset hard as a button to remote master

[horner]

I just looked a production and we have a divergent branch. Let me now when you fix so I can use it to fix prod.

root@wgd-dev:/var/lib/docker/volumes/wikiGDriveProd/_data/0AF_nrE0_QH_2Uk9PVA_transform# git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
The authenticity of host 'github.com (140.82.112.3)' can't be established.