Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Mergify to use merge rather than rebase #4

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Update Mergify to use merge rather than rebase #4

merged 1 commit into from
Jul 17, 2023

Conversation

jonathanio
Copy link
Contributor

Update Mergify to use merge rather than rebase as rebase has been disabled following that it does not protect signed commits even when it does not have to rebase the branch before merging.

Checklist

Please confirm the following checks:

  • My pull request follows the guidelines set out in CONTRIBUTING.md.
  • I have performed a self-review of my code and run any tests locally to check.
  • I have added tests that prove my changes are effective and work correctly.
  • I have made corresponding changes to the documentation as needed.
  • I have checked my code and corrected any misspellings.
  • Each commit in this pull request has a meaningful subject & body for context.
  • I have squashed all "fix(up)" commits to provide a clean code history.
  • My pull request has an appropriate title and description for context.
  • I have linked this pull request to other issues or pull requests as needed.
  • I have added type/..., changes/..., and 'release/...' labels as needed.

@jonathanio
Update Mergify to use merge rather than rebase
3e050ce 
Update Mergify to use merge rather than rebase as rebase has been
disabled following that it does not protect signed commits even when it
does not have to rebase the branch before merging.
@jonathanio jonathanio added priority/normal This is a normal-priority issue or pull request release/fix A fix for a bug or identified issue with this pull request type/bug Something is not working correctly update/configuration Update with changes to tool or service configuratons labels Jul 17, 2023
@jonathanio jonathanio requested a review from a team as a code owner July 17, 2023 19:29
@jonathanio jonathanio self-assigned this Jul 17, 2023
@jonathanio jonathanio disabled auto-merge July 17, 2023 19:33
@jonathanio jonathanio merged commit 2b53f81 into main Jul 17, 2023
5 checks passed
@jonathanio jonathanio deleted the update-mergify-merge branch July 17, 2023 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jonathanio jonathanio

Labels
priority/normal This is a normal-priority issue or pull request release/fix A fix for a bug or identified issue with this pull request type/bug Something is not working correctly update/configuration Update with changes to tool or service configuratons
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jonathanio