Skip to content

docs: document uat → main branch workflow#111

Merged
robottwo merged 1 commit intouatfrom
docs/branch-workflow
Feb 24, 2026
Merged

docs: document uat → main branch workflow#111
robottwo merged 1 commit intouatfrom
docs/branch-workflow

Conversation

@robottwo
Copy link
Copy Markdown
Owner

Document the new two-tier branching model:

  • uat is now the default branch for integration testing
  • All feature PRs merge to uat first
  • main only accepts merges from uat
  • Both branches are protected and require PRs

This establishes a clear path for changes to go through integration testing before reaching the stable main branch.

- Add Branch workflow section explaining two-tier model
- uat is now the default branch for PRs and integration testing
- main only accepts merges from uat via PR
- Update branching instructions to create branches from uat
@robottwo robottwo merged commit a731d1d into uat Feb 24, 2026
1 check failed
@robottwo robottwo deleted the docs/branch-workflow branch February 24, 2026 04:56
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b59a505f3c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread CONTRIBUTING.md

**Workflow:**
1. Create feature branches from `uat`: `feature/your-feature` or `fix/your-fix`
2. Submit PR targeting `uat` (default)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Align documented PR target with workflow branch filters

This change instructs contributors to open feature PRs against uat, but the current CI workflows are still filtered to main only (for example, .github/workflows/ci.yml, lint.yml, and govulncheck.yml use pull_request.branches: ["main"]). As a result, PRs that follow this new guidance will not run the normal automated checks, which weakens the stated uat validation step and delays detection of regressions until a later uat -> main PR.

Useful? React with 👍 / 👎.

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