enforce merge compatability between all named branches / clean merges #1291
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.
Description
This PR adds a GitHub Action that enforces clean merges from upstream branches into a pull request’s target branch. The workflow checks whether the relevant upstream branches can merge without conflicts before allowing the PR to be merged.
Workflow Behavior
devnet-ready
→ Ensuresdevnet-ready
,devnet
,testnet
, andmain
merge cleanly.devnet
→ Ensuresdevnet
,testnet
, andmain
merge cleanly.testnet
→ Ensurestestnet
andmain
merge cleanly.main
→ Ensuresmain
merges cleanly.devnet-ready
,devnet
,testnet
, andmain
).Implementation Details
git merge --no-commit --no-ff
to test merges without modifying history.git merge --abort
to clean up after each merge check.fetch-depth: 0
).Why This Change?