Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions src/content/docs/merge-protections/auto-merge.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ merge_protections_settings:

## Constraints

Merge Protections must be enabled on the repository for
`auto_merge_conditions` to take effect, with or without the merge queue. See
[Enabling & Configuring Merge Protections](/merge-protections/setup).

`auto_merge_conditions` and `queue_rules[].autoqueue` cannot be used together.
A configuration that sets both is rejected, so remove `autoqueue` from your
queue rules in the same change.
Expand Down
Binary file modified src/content/images/api-intro/application_keys.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/content/images/api-intro/application_keys_token.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.