diff --git a/.ciagent/config.json b/.ciagent/config.json index a1ca6d3..765edd1 100644 --- a/.ciagent/config.json +++ b/.ciagent/config.json @@ -31,6 +31,22 @@ "max_verification_retries": 2, "escalation_hooks": ["delete", "drop", "force", "reset --hard"] }, + "workflow": { + "no_hitl": true, + "release_flow_per_phase": true, + "merge_strategy": { + "allowed": ["fast-forward", "rebase-then-fast-forward"], + "forbidden": ["merge-commit-no-ff", "squash"], + "phase_to_milestone": "fast-forward", + "milestone_to_main": "rebase-then-fast-forward" + }, + "branching": { + "hierarchy": "main < milestone/ < phase/-", + "phase_branches": "phase/NN- merges into milestone/ via fast-forward", + "milestone_branches": "milestone/ rebases onto main, then fast-forwards main", + "default_branch": "main" + } + }, "personas": { "enabled": true, "territory_enforcement": "warn",