Merge issue on scoop update

[adnaanbheda]

I had to delete gcfscape.json to merge/update successfully, I hadn't made any changes to the json file.

Shouldn't it be doing a force merge ?

[ma3yta]

I had the same problem today:

[FDUZS]

Same here.

Zheng :: ~ » scoop update
Updating Scoop...
Updating 'extras' bucket...
error: Your local changes to the following files would be overwritten by merge:
        bucket/tcno-acc-switcher.json
        bucket/vtfedit.json
Please commit your changes or stash them before you merge.
Aborting
Updating 'java' bucket...
Updating 'main' bucket...
Updating 'nerd-fonts' bucket...
Updating 'nirsoft' bucket...
Updating 'php' bucket...
Updating 'spoon' bucket...
Updating 'versions' bucket...
Scoop was updated successfully!

[r15ch13]

That's a whitespace problem caused by (ea6bb05 / 4a0db4b). The automated update fixed the whitespaces (998d1f1 / 8520c4f) but Git on windows doesn't care. 😁

Simply remove and readd the bucket to fix this issue:

scoop bucket rm extras
scoop bucket add extras

[adnaanbheda]

@r15ch13 how is this preventable in the future ?

[r15ch13]

This should have been caught by the tests. But I don't know why it got through 😕