error: Your local changes to the following files would be overwritten by merge:

[bbigras]

bucket/shutup10.json seemed to only have white spaces changes. I wasn't able to reset it with git checkout -f so I removed the bucket extra and re-added it.

I guess scoop should detect the problem and not say "Scoop was updated successfully!".

PS C:\Users\bbigras> scoop update
Updating Scoop...
Updating 'extras' bucket...
error: Your local changes to the following files would be overwritten by merge:
        bucket/shutup10.json
Please commit your changes or stash them before you merge.
Aborting
Scoop was updated successfully!

[stdrc]

Same problem occurred to me after adding the "java" bucket. I didn't change any thing in the scoop folder.

Logs:

PS C:\Users\Richard> scoop update
Updating Scoop...
error: Your local changes to the following files would be overwritten by merge:
        README.md
        appveyor.yml
        bin/checkhashes.ps1
        bin/checkurls.ps1
        bin/checkver.ps1
        bin/install.ps1
        bin/scoop.ps1
        lib/buckets.ps1
        lib/core.ps1
        lib/decompress.ps1
        lib/depends.ps1
        lib/diagnostic.ps1
        lib/install.ps1
        lib/unix.ps1
        libexec/scoop-alias.ps1
        libexec/scoop-cache.ps1
        libexec/scoop-checkup.ps1
        libexec/scoop-cleanup.ps1
        libexec/scoop-config.ps1
        libexec/scoop-depends.ps1
        libexec/scoop-install.ps1
        libexec/scoop-list.ps1
        libexec/scoop-reset.ps1
        libexec/scoop-search.ps1
        libexec/scoop-status.ps1
        libexec/scoop-uninstall.ps1
        libexec/scoop-update.ps1
        libexec/scoop-virustotal.ps1
        libexec/scoop-which.ps1
        test/Scoop-Config.Tests.ps1
        test/Scoop-Core.Tests.ps1
        test/Scoop-Decompress.Tests.ps1
        test/bin/init.ps1
        test/bin/test.ps1
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be removed by merge:
        bucket/7zip.json
        bucket/ack.json
        bucket/acmesharp.json
        bucket/adb.json
        bucket/ag.json
        bucket/ahoy.json
        bucket/allure.json
        bucket/ammonite.json
        bucket/annie.json
        bucket/ant.json
        bucket/apache.json
        bucket/apex.json
        bucket/apngasm.json
        bucket/aria2.json
        bucket/armclient.json
        bucket/armor.json
        bucket/artifact.json
        bucket/asciidoctorj.json
        bucket/astyle.json
        bucket/atomicparsley.json
        bucket/autoit.json
        bucket/aws-iam-authenticator.json
        bucket/aws-vault.json
        bucket/aws.json
        bucket/axel.json
        bucket/bat.json
        bucket/bazel.json
        bucket/bfg.json
        bucket/blat.json
        bucket/blink1-tool.json
        bucket/bochs.json
        bucket/boxes.json
        bucket/brotli.json
        bucket/buffalo.json
        bucket/busybox.json
        bucket/bzip2.json
        bucket/cacert.json
        bucket/caddy.json
        bucket/cake.json
        bucket/casperjs.json
        bucket/ccat.json
        bucket/cdrtools.json
        bucket/cfr.json
        bucket/chroma.json
        bucket/chromedriver.json
        bucket/cht.json
        bucket/clink.json
        bucket/cloak.json
        bucket/cloc.json
        bucket/cmake.json
        bucket/cmder-full.json
        bucket/cmder.json
        bucket/cobalt.json
        bucket/cockroachdb.json
        bucket/colortool.json
        bucket/composer.json
        bucket/concfg.json
        bucket/consul.json
        bucket/coreutils.json
        bucket/coursier.json
        bucket/cowsay.json
        bucket/cppcheck.json
        bucket/cscope.json
        bucket/csvtosql.json
        bucket/ctags.json
        bucket/curl.json
        bucket/cutter.json
        bucket/cygwin.json
        bucket/dark.json
        bucket/dart.json
        bucket/datamash.json
        bucket/dd.json
        bucket/ddev.json
        bucket/deno.json
        bucket/dep.json
        bucket/devd.json
        bucket/diffutils.json
        bucket/dig.json
        bucket/digdag.json
        bucket/direnv.json
        bucket/dirhash.json
        bucket/dive.json
        bucket/dmd.json
        bucket/docfx.json
        bucket/docker-compose.json
        bucket/docker-machine.json
        bucket/docker-nightly.json
        bucket/docker.json
        bucket/doctl.json
        bucket/dokka.json
        bucket/dos2unix.json
        bucket/dosbox.json
        bucket/dotnet-sdk.json
        bucket/dotnet.json
        bucket/doxygen.json
        bucket/draft.json
        bucket/drone.json
        bucket/duplicacy.json
        bucket/dvc.json
        bucket/edgedriver.json
        bucket/editorconfig.json
        bucket/elixir.json
        bucket/elm.json
        bucket/empty-recycle-bin.json
        bucket/erlang.json
        bucket/eventstore.json
        bucket/exercism.json
        bucket/exiftool.json
        bucket/faas-cli.json
        bucket/far.json
        bucket/fd.json
        bucket/ffmpeg-nightly.json
        bucket/ffmpeg.json
        bucket/ffsend.json
        bucket/figlet.json
        bucket/file.json
        bucket/findutils.json
        bucket/flac.json
        bucket/flatc.json
        bucket/flow.json
        bucket/flyway.json
        bucket/fnproject.json
        bucket/force.json
        bucket/forego.json
        bucket/forge.json
        bucket/fossil.json
        bucket/fzf.json
        bucket/gawk.json
        bucket/gcc.json
        bucket/gdb.json
        bucket/gdrive.json
        bucket/geckodriver.json
        bucket/genact.json
        bucket/ghostscript.json
        bucket/ghq.json
        bucket/gibo.json
        bucket/gifsicle.json
        bucket/git-annex.json
        bucket/git-crypt.json
        bucket/git-interactive-rebase-tool.json
        bucket/git-istage.json
        bucket/git-lfs.json
        bucket/git-sizer.json
        bucket/git-tfs.json
        bucket/git-town.json
        bucket/git-up.json
        bucket/git-with-openssh.json
        bucket/git.json
        bucket/git19.json
        bucket/gitignore.json
        bucket/gitkube.json
        bucket/gitlab-runner.json
        bucket/gitversion.json
        bucket/glide.json
        bucket/global.json
        bucket/glslang-nightly.json
        bucket/glslang.json
        bucket/gnirehtet.json
        bucket/gnupg.json
        bucket/gnupg1.json
        bucket/go.json
        bucket/gof.json
        bucket/gomake.json
        bucket/gopass.json
        bucket/gource.json
        bucket/gow.json
        bucket/gpg.json
        bucket/gradle-bin.json
        bucket/gradle.json
        bucket/grails.json
        bucket/graphicsmagick-q16.json
        bucket/graphicsmagick-q8.json
        bucket/graphviz.json
        bucket/grep.json
        bucket/groovy.json
        bucket/groovyserv.json
        bucket/guetzli.json
        bucket/gunk.json
        bucket/gzip.json
        bucket/hadolint.json
        bucket/handbrake-cli.json
        bucket/hashcat.json
        bucket/hashlink.json
        bucket/haskell.json
        bucket/haxe-dev.json
        bucket/haxe.json
        bucket/helm.json
        bucket/helmfile.json
        bucket/highlight.json
        bucket/hub.json
        bucket/hugo-extended.json
        bucket/hugo.json
        bucket/hygen.json
        bucket/hyp
Aborting
Update failed.

[iainsgillis]

I had a similar persistent error for bucket\imagemagick.json.

The changed file was at %userprofile%\scoop\apps\scoop\current\bucket\imagemagick.json, rather than in %userprofile%\scoop\buckets\main\bucket\imagemagick.json.

Ran the following to resolve the matter:

• cd %userprofile%\scoop\apps\scoop\current\bucket
• git checkout -- imagemagick.json
• scoop update * ← right as rain 👍

Methinks it's related to the recent change to extract the main bucket into its own repo. (Thanks to everyone who worked on that!) I had done a local tweak prior to a pull request and forgot to clean up. Scoop, when it successfully updates itself, also removes that entire directory.

[cmcpasserby]

been having the same problem and it is blocking scoop from updating its extras bucket error: Your local changes to the following files would be overwritten by merge:mand] scripts/grepwin-install-context.reg scripts/grepwin-uninstall-context.reg Please commit your changes or stash them before you merge.

i tried going into that directory and doing a git reset --hard after staging the files and i also tried deleting them and checking the files back out from master.

if i git diff it shows changes on all lines of both of those files, so it appears to be white space problems since git diff --ignore-space-at-eol shows no changes.

still no clue how to make the changes go away so scoop update can work again, tried stashing, hardreset and checking them out from master.

[Ash258]

@cmcpasserby scoop bucket rm extras; scoop bucket add extras

[cmcpasserby]

@Ash258 ah feel stupid for not thinking of that but works perfect.

[rasa]

IMO, scoop should address this issue automatically, unless SCOOP_DEBUG is set.

[thatsprettygood]

IMO, scoop should address this issue automatically, unless SCOOP_DEBUG is set.

I wish it did..

[knightknight]

I had to do the same thing with /extras and /versions/ as @Ash258 post.

cd C:\Users\<username>\scoop\

Versions: scoop bucket rm versions; scoop bucket add versions Extras: scoop bucket rm extras; scoop bucket add extras

[dlong500]

I've had this happen at least 3-4 times over the past couple years. Not a huge deal to fix manually by removing/re-adding the bucket, but it does seem like this is something that should be taken care of internally by scoop given that the scoop's git usage is an internal matter that really shouldn't be exposing any side-effects to the end user. By the way, not a single case where it has happened to me has been due to an actual scoop config file being edited--it's all been artifacts/quirks of how scoop operates.

[g-berthiaume]

I still encountered this today.

@Ash258 solution worked perfectly.

 scoop bucket rm extras; scoop bucket add extras

[wisdomtooth]

I still encountered this today.

@Ash258 solution worked perfectly.

Same here.

[thatsprettygood]

When will this be handled automatically? This is getting ludicrous..

[9034725985]

In case someone stumbles across this, I got this today

Sunday, June 5, 2022 12:36:49 PM
Updating Scoop...
Updating 'extras' bucket...
 * 4e8f3eeb4 tumblthree: Update to version 2.6.3                         8 minutes ago
Updating 'main' bucket...
error: Your local changes to the following files would be overwritten by merge:
        bucket/docto.json
Please commit your changes or stash them before you merge.
Aborting
Scoop was updated successfully!
Sunday, June 5, 2022 12:36:57 PM
Scoop is up to date.
Everything is ok!
Sunday, June 5, 2022 12:36:59 PM
Updating Scoop...
Updating 'extras' bucket...
Updating 'main' bucket...
error: Your local changes to the following files would be overwritten by merge:
        bucket/docto.json
Please commit your changes or stash them before you merge.
Aborting

I was able to follow the directions here and do

date; scoop bucket rm main; date; scoop bucket add main; date;

which showed this on my screen:

Sunday, June 5, 2022 12:38:40 PM
Sunday, June 5, 2022 12:38:45 PM
Checking repo... OK
The main bucket was added successfully.
Sunday, June 5, 2022 12:39:04 PM

[xxiz]

On Windows 11, using pwsh. Got the error below and none of the above solutions worked so I just reset all changes, worked for me so I thought I'd share.

admin ❯ scoop update
Updating Scoop...
error: Your local changes to the following files would be overwritten by merge:
        CHANGELOG.md
        bin/auto-pr.ps1
        bin/checkver.ps1
        bin/scoop.ps1
        lib/buckets.ps1
        lib/decompress.ps1
        lib/manifest.ps1
        lib/shortcuts.ps1
        libexec/scoop-alias.ps1
        libexec/scoop-cache.ps1
        libexec/scoop-depends.ps1
        libexec/scoop-download.ps1
        libexec/scoop-export.ps1
        libexec/scoop-help.ps1
        libexec/scoop-info.ps1
        libexec/scoop-install.ps1
        libexec/scoop-reset.ps1
        libexec/scoop-search.ps1
        libexec/scoop-status.ps1
        libexec/scoop-update.ps1
        libexec/scoop-virustotal.ps1
        supporting/formats/ScoopTypes.Format.ps1xml
        supporting/shimexe/packages.config
        supporting/shimexe/shim.csproj
        supporting/validator/bin/Newtonsoft.Json.dll
        supporting/validator/bin/Scoop.Validator.dll
        supporting/validator/bin/checksum.sha256
        supporting/validator/bin/checksum.sha512
        supporting/validator/packages.config
        supporting/validator/validator.csproj
        test/Import-File-Tests.ps1
        test/Scoop-Decompress.Tests.ps1
        test/Scoop-Depends.Tests.ps1
        test/Scoop-Format-Manifest.Tests.ps1
        test/fixtures/decompress/TestCases.zip
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
        libexec/scoop-import.ps1
Please move or remove them before you merge.
Aborting
Update failed.

1. Switch to scoop repository
2. Reset the index and working tree.
3. Remove untracked files from the working tree
4. Fetch latest commit

cd $HOME\scoop\apps\scoop\current
git reset --hard
git clean -df
git pull