Khuslen
05/27/2025, 8:26 AMKhuslen
05/28/2025, 3:10 AMgit checkout main
error: Your local changes to the following files would be overwritten by checkout:
deploy/docker/clickhouse-setup/otel-collector-config.yaml
Please commit your changes or stash them before you switch branches.
Aborting
Khuslen
05/28/2025, 3:11 AMKhuslen
05/28/2025, 3:13 AMgit stash pop
CONFLICT (modify/delete): deploy/docker/clickhouse-setup/otel-collector-config.yaml deleted in Updated upstream and modified in Stashed changes. Version Stashed changes of deploy/docker/clickhouse-setup/otel-collector-config.yaml left in tree.
On branch main
Your branch is up to date with 'origin/main'.
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: docker/clickhouse-setup/otel-collector-config.yaml
Untracked files:
(use "git add <file>..." to include in what will be committed)
docker/clickhouse-setup/1
no changes added to commit (use "git add" and/or "git commit -a")
The stash entry is kept in case you need it again.
Khuslen
05/28/2025, 3:15 AMNagesh Bansal
05/30/2025, 6:34 AMNagesh Bansal
05/30/2025, 6:35 AMYou need to run these migration scripts step by step. For example if you are currently onand want to migrate to0.8.2
- you need to run migration script for0.10.0
first and then0.9
0.10