scoop update 有警告 git分支合成方式问题

[dong-lufei]

Prerequisites

• [X] I have written a descriptive issue title.
• [X] I have searched all issues/PRs to ensure it has not already been reported or fixed.
• [X] I have verified that I am using the latest version of Scoop and corresponding bucket.

Package Name

还没有到包那步

Expected/Current Behaviour

# 13697 @ donglufei in E:\test [11:20:44]
$ scoop update
Updating Scoop...
Updating 'apps' bucket...
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.

Steps to Reproduce

scoop update

Possible Solution

你本地仓库拉取分支合并选项设置了没

Scoop and Buckets Version

都是最新版

Scoop Config

$ scoop config

aria2-enabled                   : True
aria2-split                     : 32
aria2-max-connection-per-server : 16
aria2-min-split-size            : 1M
aria2-warning-enabled           : False
aria2-retry-wait                : 4
aria2-cnabled                   : True
last_update                     : 2023/1/18 11:21:26
scoop_branch                    : master
scoop_repo                      : https://gitee.com/scoop-bucket/scoop

PowerShell Version

$ $PSVersionTable

Name                           Value
----                           -----
PSVersion                      7.3.1
PSEdition                      Core
GitCommitId                    7.3.1
OS                             Microsoft Windows 10.0.22000
Platform                       Win32NT
PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0…}
PSRemotingProtocolVersion      2.3
SerializationVersion           1.1.0.1
WSManStackVersion              3.0

Additional Softwares

No response

[DoveBoy]

打开shell终端，手动切换到apps仓库所在的目录下，运行git fetch --all && git reset --hard origin/master

[dong-lufei]

解决了

[dong-lufei]

更新后可能又会这样，建议仓库作者设置 git config pull.rebase false