git pull failed with zigwin32

[praschke]

being lazy and using old zigmod (from two weeks ago?) to refresh zigmod:

gemini$ zigmod fetch

fetch: git: https://github.com/marlersoft/zigwin32
git pull failed

in the zigwin32 deps directory:

gemini$ 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 (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.
fatal: Need to specify how to reconcile divergent branches.

gemini$ git fetch origin
gemini$ git reset --hard origin/main

then zigmod fetch succeeded.

[nektro]

this is due to the way the zigwin32 repo is managed currently requiring the occasional --force pull which zigmod does not do. the alternative is to delete the .zigmod folder and rerun zigmod fetch