adjust auto-merge condition to include 'not_merge' state#12
Merged
The0mikkel merged 2 commits intomainfrom Nov 16, 2025
Merged
Conversation
Merge main into develop to update the develop branch to the latest version
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR updates the auto-merge condition in the develop-update workflow to handle non-merge commits. The change enables auto-merge when the latest commit on main is either a merge from develop or a regular (non-merge) commit, while still blocking auto-merge for merges from other branches.
Key changes:
- Extended auto-merge condition to include the 'not_merge' state alongside the existing 'true' state
- Added parentheses for proper logical grouping of OR conditions
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
1 participant
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.
No description provided.