Cześć,
Chciałem zaktualizować moją Suplę Scipts z wersji 3.2.0 do najnowszej.
Przy próbie upgrade-u pojawiają się następujące błędy, ktoś pomoże?
pi@raspberrypi:~/supla-scripts $ git pull
Updating 82494ae..cc03de2
error: Your local changes to the following files would be overwritten by merge:
backend/app/authorization/JwtAndBasicAuthorizationMiddleware.php
backend/app/commands/ClearDbLogsCommand.php
backend/app/commands/DispatchTimeScenesExecutionCommand.php
backend/app/commands/SendMetricsGaugesCommand.php
backend/app/commands/SuplaScriptsManager.php
backend/composer.json
backend/composer.lock
backend/controllers/ScenesController.php
backend/controllers/TokensController.php
backend/controllers/UsersController.php
backend/index.php
backend/models/User.php
backend/models/notification/Notification.php
backend/models/scene/FeedbackInterpolator.php
backend/models/scene/FeedbackTwigExtension.php
backend/models/scene/Scene.php
backend/models/scene/SceneExecutor.php
backend/models/supla/SuplaApiCached.php
backend/models/supla/SuplaApiClientWithOAuthSupport.php
backend/models/thermostat/ThermostatRoomConfig.php
classic/update.sh
docker/Dockerfile
docker/utils/crontab
docs/Installation-classic.md
frontend/app/common/navbar/navbar.html
frontend/app/logs/logs-table.coffee
frontend/app/notifications/form/notification-form.html
frontend/app/notifications/notifications-page.html
frontend/app/routes.coffee
frontend/app/scenes/details/scene-details-page.html
frontend/app/scenes/feedback/feedback-field.coffee
frontend/app/scenes/feedback/feedback-interpolation.coffee
frontend/app/scenes/feedback/feedback-interpolation.html
frontend/app/scenes/form/scene-form.html
frontend/app/scenes/scenes-page.html
frontend/app/user/account-page.html
frontend/app/user/details/account-details.html
frontend/app/user/login-form/login-view.scss
frontend/app/user/login-form/login-with-supla.html
frontend/package-lock.json
frontend/package.json
package-lock.json
package.json
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
backend/app/commands/ExecuteIntervalScenesCommand.php
backend/app/commands/ExecuteSceneCommand.php
backend/controllers/StateLogsController.php
backend/controllers/StateWebhookController.php
backend/database/migrations/20200514210622_scene_trigger.php
backend/database/migrations/20200515215427_scene_crontab.php
backend/database/migrations/20200515222927_scene_pushover.php
backend/database/migrations/20200516004133_user_webhooks.php
backend/database/migrations/20200519224717_state_logs.php
backend/database/migrations/20200520170542_scene_limit.php
backend/database/migrations/20201031102553_state_logs_indexes.php
backend/models/log/StateLogEntry.php
backend/models/scene/NotificationSender.php
backend/models/supla/ChannelFunction.php
docker/docker-compose.expose.yml
frontend/app/scenes/notifications/scene-notification-form.coffee
frontend/app/scenes/notifications/scene-notification-form.html
frontend/app/scenes/notifications/scene-notifications-field.coffee
frontend/app/scenes/notifications/scene-notifications-field.html
frontend/app/state-logs/state-logs-view.coffee
frontend/app/state-logs/state-logs-view.html
frontend/app/state-logs/state-logs.coffee
frontend/app/state-logs/state-logs.scss
frontend/app/user/pushover-credentials/pushover-credentials.coffee
frontend/app/user/pushover-credentials/pushover-credentials.html
public/img/bg.svg
Please move or remove them before you merge.
Aborting
pi@raspberrypi:~/supla-scripts $