story: workspace branch cleanup ritual + auto-merge development into feature branches #217

New issue

Open

opened 2026-05-06 17:07:16 +00:00 by mik-tf · 0 comments

mik-tf commented

2026-05-06 17:07:16 +00:00

Owner

Overview

Across ~20 repos in lhumina_code, feature branches accumulate after squash-merge — both locally and on remote. Devs also forget to git pull && git merge development into their feature branches before resuming work, so we hit avoidable conflicts. This needs to be one documented + automated ritual that everyone runs.

Why

Meeting 2026-05-06: "clean up branches" (3×) — "always clean branches on remote" — "always git pull merge development into our branches"
Existing memory: feedback_no_rebase_merge_dev.md — never rebase, always merge.
Existing skill: code_manage_development_branch — already handles part of this, needs to be the canonical entry point.

Acceptance

One skill (or one nu-shell script) that runs across the whole workspace and:
- prunes merged remote branches per repo
- prunes their local tracking refs
- on every feature branch, does git pull && git merge origin/development (does NOT push)
Documented in CLAUDE.md as the "before resuming work" ritual
No destructive defaults — never delete unmerged branches, never force-push

Skill: code_manage_development_branch
Memory: feedback_no_rebase_merge_dev.md
hero_skills#181 — svc_update auto-commit hazard

Source: meeting notes 2026-05-06.

## Overview Across ~20 repos in `lhumina_code`, feature branches accumulate after squash-merge — both locally and on remote. Devs also forget to `git pull && git merge development` into their feature branches before resuming work, so we hit avoidable conflicts. This needs to be one documented + automated ritual that everyone runs. ## Why - Meeting 2026-05-06: "clean up branches" (3×) — "always clean branches on remote" — "always git pull merge development into our branches" - Existing memory: [feedback_no_rebase_merge_dev.md](memory) — never rebase, always merge. - Existing skill: `code_manage_development_branch` — already handles part of this, needs to be the canonical entry point. ## Acceptance - [ ] One skill (or one nu-shell script) that runs across the whole workspace and: - prunes merged remote branches per repo - prunes their local tracking refs - on every feature branch, does `git pull && git merge origin/development` (does NOT push) - [ ] Documented in CLAUDE.md as the "before resuming work" ritual - [ ] No destructive defaults — never delete unmerged branches, never force-push ## Related - Skill: `code_manage_development_branch` - Memory: `feedback_no_rebase_merge_dev.md` - [hero_skills#181](https://forge.ourworld.tf/lhumina_code/hero_skills/issues/181) — svc_update auto-commit hazard Source: meeting notes 2026-05-06.