Bookstack
error: The following untracked working tree files would be overwritten by merge
Bei dem Update von V22.11.1 habe ich folgende Fehlermeldung bekommen
$ sudo git pull origin release
From https://github.com/BookStackApp/BookStack
* branch release -> FETCH_HEAD
Updating e794c977..ce9b536b
error: The following untracked working tree files would be overwritten by merge:
app/Auth/Permissions/EntityPermissionEvaluator.php
app/Auth/Permissions/MassEntityPermissionEvaluator.php
app/Auth/Permissions/PermissionStatus.php
app/Settings/AppSettingsStore.php
app/Translation/MessageSelector.php
database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php
dev/docs/permission-scenario-testing.md
public/icon-128.png
public/icon-180.png
public/icon-32.png
public/icon-64.png
public/icon.png
resources/js/components/setting-app-color-scheme.js
resources/views/books/parts/sort-box-actions.blade.php
resources/views/settings/parts/setting-color-picker.blade.php
resources/views/settings/parts/setting-color-scheme.blade.php
tests/Helpers/PermissionsProvider.php
tests/Helpers/UserRoleProvider.php
tests/Permissions/Scenarios/EntityRolePermissionsTest.php
tests/Permissions/Scenarios/PermissionScenarioTestCase.php
tests/Permissions/Scenarios/RoleContentPermissionsTest.php
Please move or remove them before you merge.
Zuerst solltest du ein Backup erstellen, bevor du hier weiter machst.
Danach führst du diesen Befehl aus
$ sudo git clean -d -f
Removing .env.bak
Removing app/Auth/Permissions/EntityPermissionEvaluator.php
Removing app/Auth/Permissions/MassEntityPermissionEvaluator.php
Removing app/Auth/Permissions/PermissionStatus.php
Removing app/Settings/AppSettingsStore.php
Removing app/Translation/MessageSelector.php
Removing database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
Removing database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php
Removing dev/docs/permission-scenario-testing.md
Removing public/icon-128.png
Removing public/icon-180.png
Removing public/icon-32.png
Removing public/icon-64.png
Removing public/icon.png
Removing public/impressum.php
Removing resources/js/components/setting-app-color-scheme.js
Removing resources/views/books/parts/sort-box-actions.blade.php
Removing resources/views/settings/parts/setting-color-picker.blade.php
Removing resources/views/settings/parts/setting-color-scheme.blade.php
Removing tests/Helpers/PermissionsProvider.php
Removing tests/Helpers/UserRoleProvider.php
Removing tests/Permissions/Scenarios/
Danach kannst du der Anleitung weiter folgen und das Update einspielen.