Skip to main content

branch cleanup plan

Branch Cleanup Plan - January 11, 2026

Branch Audit Results

✅ Safe to Delete (Already Merged)

Local branches:

  • 58-discord-link - MR #281 merged, changes in release/v0.3.x → main
  • release/merge-to-main-resolved - MR #284 merged to main

Remote branches (auto-sync - redundant):

  • origin/chore/auto-sync-20260110-043554 - Old auto-sync
  • origin/chore/auto-sync-20260110-164334 - MR #277 closed (redundant)
  • origin/chore/auto-sync-20260110-172656 - MR #280 closed (redundant)
  • origin/chore/auto-sync-20260111-133632 - MR #285 closed (redundant)

⚠️ Need to Check MR Status

Branches with MRs:

  • 61-add-gitlab-link - MR #273
  • 62-version-consistency-ci - MR #275
  • 63-link-checker-agent - MR #274
  • hotfix/version-0.3.1 - MR #222
  • duo/feature/69-complete-audit-agent-driven-website-strategy - MR #265

🔄 Active Branches (Keep)

  • release/v0.3.x - Active release branch (227 commits ahead, expected)
  • docs/update-readme-naming - MR #286 open, ready to merge
  • main - Production branch

Cleanup Actions

Immediate Cleanup

  1. Delete merged local branches:
git branch -d 58-discord-link release/merge-to-main-resolved
  1. Delete merged remote branches (if safe):
git push origin --delete chore/auto-sync-20260110-043554 git push origin --delete chore/auto-sync-20260110-164334 git push origin --delete chore/auto-sync-20260110-172656 git push origin --delete chore/auto-sync-20260111-133632
  1. Check and handle branches with MRs:
    • If MRs are merged → delete branches
    • If MRs are open → rebase onto main or close MRs
    • If MRs are closed → delete branches

Prevention

Auto-sync branches:

  • These are created by CI automation
  • Should auto-merge or auto-close
  • Consider adding cleanup job to delete old auto-sync branches

Feature branches:

  • All feature branches should target release/v0.3.x (not main)
  • Validation job enforces this
  • After merge to release, they get merged to main via release branch

Branch Status Summary

BranchMRStatusAction
58-discord-link#281MergedDelete
61-add-gitlab-link#273CheckVerify merged
62-version-consistency-ci#275CheckVerify merged
63-link-checker-agent#274CheckVerify merged
hotfix/version-0.3.1#222CheckVerify merged
duo/feature/69-...#265CheckVerify merged
release/merge-to-main-resolved#284MergedDelete
chore/auto-sync-* (4 branches)VariousClosedDelete
release/v0.3.x-ActiveKeep
docs/update-readme-naming#286OpenKeep until merged