Skip to content

Commit d6e6862

Browse files
Remove references to deprecated dependabot commands (#62251)
1 parent 285cc06 commit d6e6862

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

content/code-security/reference/code-scanning/troubleshoot-analysis-errors/resource-not-accessible.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ on:
6161
If the {% data variables.code-scanning.codeql_workflow %} still fails on a commit made on the default branch, you need to check:
6262
6363
* Whether {% data variables.product.prodname_dependabot %} authored the commit
64-
* Whether the pull request that includes the commit has been merged using `@dependabot squash and merge`
64+
* Whether the pull request that includes the commit has been merged using squash and merge
6565
66-
This type of merge commit is authored by {% data variables.product.prodname_dependabot %} and therefore, any workflows running on the commit will have read-only permissions. If you enabled {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} security updates or version updates on your repository, we recommend you avoid using the {% data variables.product.prodname_dependabot %} `@dependabot squash and merge` command. Instead, you can enable auto-merge for your repository. This means that pull requests will be automatically merged when all required reviews are met and status checks have passed. For more information about enabling auto-merge, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request#enabling-auto-merge).
66+
This type of merge commit is authored by {% data variables.product.prodname_dependabot %} and therefore, any workflows running on the commit will have read-only permissions. If you enabled {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} security updates or version updates on your repository, we recommend you enable auto-merge on the pull request with the **Create a merge commit** strategy. This avoids the squash-merge commit that would be authored by {% data variables.product.prodname_dependabot %}. For more information about enabling auto-merge, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request#enabling-auto-merge).

content/code-security/reference/supply-chain-security/dependabot-pull-request-comment-commands.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,21 @@ category:
1212
- Secure your dependencies
1313
---
1414

15-
{% data variables.product.prodname_dependabot %} responds to simple commands in comments. Each pull request contains details of the commands you can use to process the pull request (for example: to merge, squash, reopen, close, or rebase the pull request) under the "{% data variables.product.prodname_dependabot %} commands and options" section. The aim is to make it as easy as possible for you to triage these automatically generated pull requests.
15+
{% data variables.product.prodname_dependabot %} responds to simple commands in comments. Each pull request contains details of the commands you can use to process the pull request (for example, to rebase the pull request) under the "{% data variables.product.prodname_dependabot %} commands and options" section. The aim is to make it as easy as possible for you to triage these automatically generated pull requests.
1616

1717
## Commands for {% data variables.product.prodname_dependabot %} pull requests
1818

1919
You can use any of the following commands on a {% data variables.product.prodname_dependabot %} pull request.
2020

2121
| Command | Description |
2222
| --- | --- |
23-
| `@dependabot cancel merge` | Cancels a previously requested merge. |
24-
| `@dependabot close` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from recreating that pull request. You can achieve the same result by closing the pull request manually. |
2523
| `@dependabot ignore this dependency` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this dependency (unless you reopen the pull request or upgrade to the suggested version yourself). |
2624
| `@dependabot ignore this major version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this major version (unless you reopen the pull request or upgrade to this major version yourself). |
2725
| `@dependabot ignore this minor version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this minor version (unless you reopen the pull request or upgrade to this minor version yourself). |
2826
| `@dependabot ignore this patch version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this patch version (unless you reopen the pull request or upgrade to this patch version yourself). |
29-
| `@dependabot merge` | Merges the pull request once your CI tests have passed. |
3027
| `@dependabot rebase` | Rebases the pull request. |
3128
| `@dependabot recreate` | Recreates the pull request, overwriting any edits that have been made to the pull request. |
32-
| `@dependabot reopen` | Reopens the pull request if the pull request is closed. |
3329
| `@dependabot show DEPENDENCY_NAME ignore conditions` | Retrieves information on the ignore conditions for the specified dependency, and comments on the pull request with a table that displays all ignore conditions for the dependency. For example, `@dependabot show express ignore conditions` would find all `ignore` conditions stored for the Express dependency, and comment on the pull request with that information. |
34-
| `@dependabot squash and merge` | Squashes and merges the pull request once your CI tests have passed. |
3530

3631
## Commands for grouped version updates
3732

0 commit comments

Comments
 (0)