[Oberon] Reconciling branches in the git repository.

[peter at easthope.ca]

Currently the A2 repository has branches main, bohdan and override.

main seems a reasonable choice for me.  Therefore, to update the local 
copy of the repository, did this,
root at imager:/home/root/A2# git pull origin main
with this result.

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.

If a specific branch is pulled, why is reconciliation necessary?

Thanks,                          ... P.L.


-- 
VoIP:   +1 604 670 0140
work: https://en.wikibooks.org/wiki/User:PeterEasthope