Skip to content

Commit d9eabf3

Browse files
authored
Document topic branch lifecycle (#14)
1 parent 631ba7b commit d9eabf3

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

‎AGENTS.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@ repository.
1616
- Record repository-specific product and release decisions locally in
1717
`ROADMAP.md`, `ARCHITECTURE.md`, `RELEASING.md`, and this file.
1818

19+
## Git Branch Lifecycle
20+
21+
- Use a dedicated short-lived topic branch for each task. `dev` is the clean
22+
local landing branch between tasks; do not commit task changes directly to
23+
`dev`.
24+
- After a topic branch has been merged or otherwise explicitly accepted and
25+
its required verification is complete, treat its active lifecycle as closed.
26+
With a clean worktree, fetch `origin`, fast-forward local `main` to
27+
`origin/main`, fast-forward local `dev` to `main`, and finish with `dev`
28+
checked out. Cleanup is complete only when local `main`, local `dev`, and
29+
`origin/main` resolve to the same commit.
30+
- Never reset, discard work, force-update refs, delete branches, or push `dev`
31+
merely to complete this cleanup. If fetching fails, the worktree is dirty,
32+
either fast-forward is impossible, or the three final refs differ, stop and
33+
report the exact state instead of forcing synchronization.
34+
1935
## Current Milestone: Public Preview
2036

2137
Private Remote Validation is complete, and the current execution target is

0 commit comments

Comments
 (0)