Switch project to squash-merge mode #890
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
samdoran
approved these changes
Oct 29, 2021
![ansible-zuul[bot]](https://avatars.githubusercontent.com/in/27800?s=60&v=4){kind=small}
This was referenced Oct 29, 2021
This was referenced Nov 4, 2021
ansible-zuul bot
added a commit
that referenced
this pull request
Nov 4, 2021
Revert "Switch project to squash-merge mode" Reverts #890 Doesn't look like this works as a setting in-repo for some unknown reason. Following suit with other projects that set this in project-config: ansible/project-config#971 Reviewed-by: Sam Doran <sdoran@redhat.com> Reviewed-by: None <None>
ansible-zuul bot
added a commit
to ansible/project-config
that referenced
this pull request
Nov 5, 2021
Switch runner and builder merge mode to squash-merge Tried adding this setting to ansible-runner and ansible-builder repo project definitions (ansible/ansible-runner#890 and ansible/ansible-builder#296), but doesn't look like its working from there. Reviewed-by: Sam Doran <sdoran@redhat.com> Reviewed-by: None <None>
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.
Per the Zuul documentation for project configuration, this should change our merge mode from
merge-resolve(the default) tosquash-merge.