Skip to content

chore(mergify): indicate that users should not update manually after approval #6465

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

Merged
eladb merged 4 commits into from
Feb 26, 2020
Merged

chore(mergify): indicate that users should not update manually after approval #6465

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e26aa80
chore(mergify): indicate that users should not update manually after …
Feb 26, 2020
7a9923c
fix typo
Feb 26, 2020
9319917
Update .mergify.yml
Feb 26, 2020
ff3bb5a
Update .mergify.yml
Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pull_request_rules:
- name: automatic merge
actions:
comment:
message: Thank you for contributing! Your pull request is now being automatically merged.
message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually).
merge:
strict: smart
method: squash
Expand All @@ -34,7 +34,7 @@ pull_request_rules:
- name: automatic merge
actions:
comment:
message: Thank you for contributing! Your pull request is now being automatically merged without squashing.
message: Thank you for contributing! Your pull request will be updated from master and then merged automatically without sqaushing (do not update manually).
Copy link
Contributor

@rix0rrr rix0rrr Feb 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo

Copy link
Contributor

@rix0rrr rix0rrr Feb 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, might be worthwhile to toss in this link as well, because ppl need to have "maintainers can push to fork" enabled (and it cannot be enabled in forks based in organizations).

https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork

Copy link
Contributor Author

@eladb eladb Feb 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed the typo. Not exactly understand how this link should be added. Perhaps you can just suggest a phrasing with this link inside?

merge:
strict: smart
# Merge instead of squash
Expand Down