From a2307511aedcaedfcfa4ba6f99f8bb5f01c54e42 Mon Sep 17 00:00:00 2001 From: Steve Yegge Date: Thu, 25 Dec 2025 18:55:00 -0800 Subject: [PATCH] docs: Fix misleading comment about refinery branch --- internal/rig/manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rig/manager.go b/internal/rig/manager.go index 01aa67c3..bd689ffc 100644 --- a/internal/rig/manager.go +++ b/internal/rig/manager.go @@ -239,9 +239,9 @@ func (m *Manager) AddRig(opts AddRigOptions) (*Rig, error) { return nil, fmt.Errorf("creating mayor CLAUDE.md: %w", err) } - // Create refinery as worktree from bare repo on main. - // Refinery stays on main to merge polecat branches into main. - // Uses the same main branch as mayor - they share the working copy. + // Create refinery as worktree from bare repo on its own branch. + // Refinery can see all polecat branches (shared .repo.git) and merges them to main. + // Uses a separate "refinery" branch to avoid conflict with mayor on main. refineryRigPath := filepath.Join(rigPath, "refinery", "rig") if err := os.MkdirAll(filepath.Dir(refineryRigPath), 0755); err != nil { return nil, fmt.Errorf("creating refinery dir: %w", err)