Skip to content

chore: drop personal lineage + perennial entries from team git-town config#430

Open
mhotan wants to merge 1 commit into
mainfrom
mike/scrub-personal-git-town-config
Open

chore: drop personal lineage + perennial entries from team git-town config#430
mhotan wants to merge 1 commit into
mainfrom
mike/scrub-personal-git-town-config

Conversation

@mhotan

@mhotan mhotan commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

Summary

.git-branches.toml is the team-shared git-town config. Today it carries entries that only mean something to one contributor's working branches:

perennials = ["mike/monitoring-testing-wip"]

[lineage]
"mike/prometheus-refactor" = "main"
"mike/controlplane-monitoring" = "mike/prometheus-refactor"

Those refs don't exist for anyone else and just clutter the shared config. Personal lineage + perennial bookkeeping belongs in each contributor's local .git/config (which git town set-parent and git config git-town.perennial-branches write to).

Changes

  • perennials = []
  • [lineage] empty

Test plan

  • git town config still parses; lineage shows whatever's set in local .git/config per contributor.
  • No effect on CI, builds, or any chart output.

@aviator-app

aviator-app Bot commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

Current Aviator status

Aviator will automatically update this comment as the status of the PR changes.
Comment /aviator refresh to force Aviator to re-examine your PR (or learn about other /aviator commands).

This pull request is currently open (not queued).

How to merge

To merge this PR, comment /aviator merge or add the mergequeue label.


See the real-time status of this PR on the Aviator webapp.
Use the Aviator Chrome Extension to see the status of your PR within GitHub.

@mhotan mhotan force-pushed the mike/scrub-personal-git-town-config branch from 363f8e9 to 5c620cd Compare June 6, 2026 01:11
…onfig

Branches under `[lineage]` and `perennials` referenced individual
working branches (mike/*). Those belong in each contributor's local
.git/config, not the shared team file.
@mhotan mhotan force-pushed the mike/scrub-personal-git-town-config branch from 5c620cd to cd9a0ae Compare June 8, 2026 19:50
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.

1 participant