Scoop-extras: Merge issue on scoop update
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 ?
adnaanbheda
All 5 comments
I had the same problem today:
Ma3yTa
on 14 Sep 2020
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!
FDUZS
on 15 Sep 2020
That's a whitespace problem caused by (https://github.com/lukesampson/scoop-extras/commit/ea6bb05d36b97be5a4e93dd05e8344262ff0adf8 / https://github.com/lukesampson/scoop-extras/commit/4a0db4b234b68a3abd76cff28bc9ef5c204d4ac5). The automated update fixed the whitespaces (https://github.com/lukesampson/scoop-extras/commit/998d1f13650b90a5abc848d698658fa648d3d28a / https://github.com/lukesampson/scoop-extras/commit/8520c4ffface0a4945f1472b7a04193d9d82b03b) but Git on windows doesn't care. :grin:
Simply remove and readd the bucket to fix this issue:
scoop bucket rm extras
scoop bucket add extras
r15ch13
on 15 Sep 2020
@r15ch13 how is this preventable in the future ?
adnaanbheda
on 15 Sep 2020
This should have been caught by the tests. But I don't know why it got through 馃槙
r15ch13
on 15 Sep 2020
Related issues
ggobbe
路
3Comments
rasa
路
8Comments
Anniywell
路
10Comments
jahead
路
11Comments
ksawerykarwacki
路
8Comments
Most helpful comment
That's a whitespace problem caused by (https://github.com/lukesampson/scoop-extras/commit/ea6bb05d36b97be5a4e93dd05e8344262ff0adf8 / https://github.com/lukesampson/scoop-extras/commit/4a0db4b234b68a3abd76cff28bc9ef5c204d4ac5). The automated update fixed the whitespaces (https://github.com/lukesampson/scoop-extras/commit/998d1f13650b90a5abc848d698658fa648d3d28a / https://github.com/lukesampson/scoop-extras/commit/8520c4ffface0a4945f1472b7a04193d9d82b03b) but Git on windows doesn't care. :grin:
Simply remove and readd the bucket to fix this issue: