cb2fc088a8
Resolves conflicts in packages/plugins/workspace-worktree/src/__tests__/index.test.ts:
keep the PR's new tests covering the SHA-comparison guard ("reuses an existing
branch when it matches", "resets an existing stale branch", "handles existing
branch with local default branch when origin is missing") over main's older
tests that asserted the buggy worktree-add+checkout fallback. Pick up
GIT_TIMEOUT (timeout: 30_000) on the new test assertions to match main.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
||
|---|---|---|
| .. | ||
| src | ||
| CHANGELOG.md | ||
| package.json | ||
| tsconfig.json | ||