Skip to content

docs: ADR-002 activate GitFlow #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmuhoro merged 1 commit into from
Jul 31, 2026
Merged

docs: ADR-002 activate GitFlow #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions docs/decisions/ADR_002_GITFLOW_ACTIVATED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# ADR-002

## Decision

TraderOS operates a GitFlow branch strategy from Sprint 14 onward.

- `main` — production, protected. Receives code only via `release/*` PRs.
- `develop` — integration branch (created at commit `1205b6f`, 2026-07-31). Receives `feature/*`, `fix/*`, and `wp/*` branches via PR.
- No direct pushes to `main` or `develop`; all merges via PR with gates G1-G6 passing.
- Releases: `develop` reaches release criteria, cut `release/vX.Y.Z`, run release checklist, tag semver, merge to `main` and `develop`.

## Reason

The documented workflow (`.ai/context/11_workflow-rules.md`) mandated GitFlow from the start, and `.github/workflows/ci.yml` already targeted `main` and `develop` — but `develop` was never created. Prior programmes (Sprint 9, Programme Omega, Programme A, Programme B) committed directly to `main`, a deviation that had no recorded approval. This ADR records the activation of the intended strategy and closes the deviation.

The pre-existing `sprint-2-paper-trading` branch (tip `454f8e8`) is an abandoned divergent line; its history diverges at `ae2c789`. Its tip is preserved for archival on origin but it is not part of the active GitFlow.

## Status

Accepted
Loading