I need the merge policy "force squash and merge unless source branch is protected then force regular merge" #145856
Replies: 3 comments
-
Check out the new PR setting in rulesets that recently went to preview to see if that helps you achieve the outcome you are after: https://github.com/orgs/community/discussions/146284 |
Beta Was this translation helpful? Give feedback.
-
Thanks for posting in the GitHub Community, @peterHakio! We're happy you're here. You are more likely to get a useful response if you are posting your question in the applicable category, the Discussions category is solely related to conversations around the GitHub product Discussions. This question should be in the Pull Requests category. I've gone ahead and moved it for you. Good luck! |
Beta Was this translation helpful? Give feedback.
-
🕒 Discussion Activity Reminder 🕒 This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions: 1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as 2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own. 3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution. Note: This dormant notification will only apply to Discussions with the Thank you for helping bring this Discussion to a resolution! 💬 |
Beta Was this translation helpful? Give feedback.
-
Select Topic Area
Product Feedback
Body
When having a setup where feature branches is merged into a stable branch (staging) which is occationaly merged into main, I would prefer to have all feature branches merge with squash and merge and when staging and main gets merged into each other do it with regular merge, since I don't want to destroy history. It makes allot of sense that you naturally can't squash and merge protected branches and all non protected branches should be merged with squash and merge. I have used this policy for many years in the repo's I have were github flow is not an option.
I think this would be very nice to have that setting that enforces that.
Beta Was this translation helpful? Give feedback.
All reactions