Simplify worktree path uniqueness handling #19
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
Instead of forcefully removing existing worktrees and branches, append a short UUID to the worktree path when a conflict is detected. This approach is cleaner and avoids destructive operations. Changes: - Append short UUID to worktree path if directory already exists - Remove forced worktree removal logic - Remove forced branch deletion logic - Move shortUuid extraction earlier for reuse - Change worktreePath from const to let for modification Co-Authored-By: Claude <[email protected]>
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
Simplifies the worktree creation logic by appending a short UUID to the worktree path when a conflict is detected, instead of forcefully removing existing worktrees and deleting branches. This approach is cleaner and less destructive.
Changes
git worktree remove --force)git branch -D)Benefits
Test plan