Skip to content

Warn on base branches checked out in worktrees#405

Merged
chubes4 merged 1 commit into
mainfrom
fix/worktree-base-branch-warnings
May 15, 2026
Merged

Warn on base branches checked out in worktrees#405
chubes4 merged 1 commit into
mainfrom
fix/worktree-base-branch-warnings

Conversation

@chubes4
Copy link
Copy Markdown
Member

@chubes4 chubes4 commented May 15, 2026

Summary

  • Flag non-primary worktrees checked out on base/protected branch names so gh pr merge --delete-branch cleanup failures are visible before merges.
  • Surface the warning in worktree list results, hygiene summaries, and human CLI output.
  • Add smoke coverage for the base-branch worktree warning path.

Closes #404.

Testing

  • php -l inc/Workspace/WorkspaceWorktreeLifecycle.php
  • php -l inc/Workspace/WorkspaceHygieneReport.php
  • php -l inc/Cli/Commands/WorkspaceCommand.php
  • php tests/smoke-worktree-list-scaling.php
  • homeboy test --path /Users/chubes/Developer/data-machine-code@fix-worktree-base-branch-warnings --extension wordpress

Notes

  • homeboy lint --path /Users/chubes/Developer/data-machine-code@fix-worktree-base-branch-warnings --extension wordpress still fails on existing unrelated lint debt outside this change.

AI assistance

  • AI assistance: Yes
  • Tool(s): OpenCode (openai/gpt-5.5)
  • Used for: Filing the issue, implementing the worktree warning surfaces, and running focused smoke/activation checks. Chris identified the confusing gh pr merge --delete-branch failure mode from the Homeboy Extensions merge.

@chubes4 chubes4 merged commit b1aefd1 into main May 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Warn when non-primary worktrees hold base branches before PR merges

1 participant