fix: group imported worktree sessions under repository - #575
Open
dawNotPoi wants to merge 1 commit into
Open
Conversation
dawNotPoi
marked this pull request as ready for review
August 25, 2026 14:28
xintaofei
force-pushed
the
fix/imported-codex-worktree-grouping
branch
from
August 25, 2026 22:41
18b09ee to
c082309
Compare
Owner
为什么要重建本 PR 原本是从 多出来的 87 个提交带来四个问题:
「Squash and merge」解决不了:它只压缩历史、不改内容,上面第 2、3 条照样会落地。 做了什么把你的提交
原 tip 你本地要做的分支已被重写,直接 pull 会产生一个假合并。请用: git fetch origin
git checkout fix/imported-codex-worktree-grouping
git reset --hard origin/fix/imported-codex-worktree-grouping(如果你的 fork 远端名不是 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #552.
Tests
cargo test --no-default-features --features test-utils --lib batch_import_cargo test --no-default-features --features test-utils --lib add_imported_folder_core_keeps_non_worktree_paths_top_levelcargo test --no-default-features --features test-utils --libcargo check --no-default-features --features test-utilscargo clippy --no-default-features --all-targets --features test-utils -- -D warningsThe default desktop test target could not be built locally because this WSL environment does not have the
gdk-3.0development package; the shared/server Rust target and strict clippy checks pass.