SX2@makoto 08:32:30/230507(..git-work/netbsd-src)% git pull
warning: redirecting to https://github.com/IIJ-NetBSD/netbsd-src/
remote: Enumerating objects: 205208, done.
remote: Counting objects: 100% (75260/75260), done.
remote: Compressing objects: 100% (1062/1062), done.
remote: Total 205208 (delta 74196), reused 75241 (delta 74190), pack-reused 129948
Receiving objects: 100% (205208/205208), 278.57 MiB | 9.65 MiB/s, done.
Resolving deltas: 100% (168503/168503), completed with 19182 local objects.
From http://github.com/IIJ-NetBSD/netbsd-src
   025caf2395f..766c72c19da  master     -> origin/master
 * [new branch]              netbsd-10  -> origin/netbsd-10
   41205f1b587..a457ead2823  netbsd-6   -> origin/netbsd-6
   cbd11cbb7c7..2a5630b4849  netbsd-7   -> origin/netbsd-7
   295dbf2e9ba..f4e744ccb8b  netbsd-8   -> origin/netbsd-8
   4a25d6f57ec..925f41e229c  netbsd-9   -> origin/netbsd-9
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.

I'm too silly (?) to take the first option among shown listed, but NOT good.

SX2@makoto 08:36:40/230507(..git-work/netbsd-src)%  git config pull.rebase false

SX2@makoto 08:36:44/230507(..git-work/netbsd-src)% git pull
warning: redirecting to https://github.com/IIJ-NetBSD/netbsd-src/
Auto-merging distrib/sets/lists/tests/mi
CONFLICT (content): Merge conflict in distrib/sets/lists/tests/mi
Auto-merging share/man/man9/atomic_loadstore.9
CONFLICT (content): Merge conflict in share/man/man9/atomic_loadstore.9
Auto-merging share/man/man9/uvm_hotplug.9
CONFLICT (content): Merge conflict in share/man/man9/uvm_hotplug.9
Auto-merging usr.bin/make/unit-tests/varmod-edge.exp
CONFLICT (content): Merge conflict in usr.bin/make/unit-tests/varmod-edge.exp
Auto-merging usr.bin/make/unit-tests/varmod-edge.mk
CONFLICT (content): Merge conflict in usr.bin/make/unit-tests/varmod-edge.mk
Automatic merge failed; fix conflicts and then commit the result.

SX2@makoto 08:38:06/230507(..git-work/netbsd-src)% git branch
  8.99.28
  debug-acpi-201901
  debug-drm
  iwn-debug
* master
  mptutil
  netbsd-7
  netbsd-9
  panasonic
  sloss-toughbook
  sloss-toughbook-9
  sloss-toughbook-9.0
  sshd

I often encountered the problem shown above, and now thiks my option was bad.
Then I took the second one, looks (works) good

SX2@makoto 08:39:25/230507(..git-work/netbsd-src)%  git config pull.rebase true

SX2@makoto 08:39:32/230507(..git-work/netbsd-src)% git merge --abort
Updating files: 100% (158700/158700), done.

SX2@makoto 08:40:37/230507(..git-work/netbsd-src)% git pull
warning: redirecting to https://github.com/IIJ-NetBSD/netbsd-src/
warning: skipped previously applied commit 1449ec34474
warning: skipped previously applied commit 1e9ad558f7b
warning: skipped previously applied commit d459f1e9bef
warning: skipped previously applied commit 8e9097a515d
warning: skipped previously applied commit 80baaac0d21
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Successfully rebased and updated refs/heads/master.