Ok, git pull works
~/nodebb$ git pull
remote: Enumerating objects: 475, done.
remote: Counting objects: 100% (475/475), done.
remote: Compressing objects: 100% (231/231), done.
remote: Total 475 (delta 248), reused 469 (delta 244), pack-reused 0
Receiving objects: 100% (475/475), 417.93 KiB | 13.06 MiB/s, done.
Resolving deltas: 100% (248/248), completed with 54 local objects.
From https://github.com/NodeBB/NodeBB
7d9ff9bf4e..d36140eb5f develop -> origin/develop
c44ddb10e7..055762e69e master -> origin/master
638e098f30..dc14d6a8d1 v2.x -> origin/v2.x
* [new tag] v2.8.17 -> v2.8.17
* [new tag] v3.3.5 -> v3.3.5
My other forum show this
~/nodebb$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
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.
fatal: Need to specify how to reconcile divergent branches.