Repository navigation
Default to main while retaining develop integration PRs - #32
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Make main the repository's default branch while retaining develop as the feature/fix integration branch. Update README, CONTRIBUTING.md, and agent instructions to require an explicit develop PR base for feature/fix work.
Add an early check to the existing required backend CI job that rejects feat/* and fix/* PRs targeting main, with a message to retarget develop. Release PRs from develop, hotfix PRs into main, and main-to-develop synchronization remain allowed. CI still runs for pushes/PRs on both permanent branches.
The GitHub default-branch setting is already updated to main. Both existing rulesets target explicit branch names and remain unchanged: required PRs/checks, strict up-to-date policy, resolved conversations, zero approvals, no bypass actors, and blocked force pushes/deletion. No branch code was merged into main.
Validation: YAML triggers and seven PR-target scenarios passed, including rejection of feature/fix PRs to main and acceptance of integration, release, hotfix, and synchronization paths. git diff --check and both required GitHub Actions checks passed in run 40970388913. Existing warn-only type, lint, audit, and action-runtime findings remain separate from required-check success.
Release PR #29 remains draft pending manual Azure AI Foundry/OpenRouter smoke checks and explicit main-merge authorization. This workflow change does not authorize a release or deployment.