Clarify merge strategy #40
Merged
Conversation
This file contains 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
|
Should we protect the production branch too? |
I think the protection we gain with .asf.yaml will only prevent force push. I'll add that to this PR. Does not look like we can protect the prod branch against random push, i.e. require a merge from main... |
|
Small change, I think it would be nice to not allow the "squash merge" from a PR for the production branch. |
Agree but don’t think that is possible to describe in asf.yaml without disabling squash on master too. |
|
Ahh yeah I think you are right. Unfortunate |
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.
To avoid production and master branches for the website coming out of sync, we clarify that all edits should be committed to master branch, and then merge master -> production branch.
Also allow merge commit from GitHub UI merge button, and not force squash commit, which will allow us to use the UI to do the merge from master->production.