feat(worktrees): configurable base branch + local/remote picker - #752
Merged
Conversation
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
Project worktrees can now start from a branch selected per project while preserving Acorn's existing automatic default behavior.
Expected impact
Design notes
refs/heads/...orrefs/remotes/...) so identically named local and remote branches remain unambiguous.origin/<name>.Test plan
pnpm run typecheckpnpm run test— 109 files, 1,289 tests passedpnpm exec playwright test tests/e2e/project-settings.spec.ts— 9 tests passedpnpm run buildcargo test --manifest-path src-tauri/Cargo.toml project_settings::tests --lib— 5 tests passedcargo test --manifest-path src-tauri/Cargo.toml worktree::tests --lib— 28 tests passedcargo check --manifest-path src-tauri/Cargo.tomlrustfmt --checkfor the modified Rust modulesgit diff --checkNotes
cargo fmt --checkstill reports the pre-existing formatting difference insrc-tauri/src/pty_env.rs; this PR does not modify that file.cargo checkreports five pre-existing dead-code warnings.