Skip to content

[pull] main from github:main #40

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
merged 10 commits into from
Apr 20, 2021
Merged

[pull] main from github:main #40

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e1b282d
Merge branch 'main' into repo-sync
Octomerger Apr 19, 2021
5e95ca5
Merge pull request #18864 from github/repo-sync
Octomerger Apr 19, 2021
6f3b71b
[April 19th] Remove Visual Studio 2019 Codespaces content (#18727)
timeyoutakeit Apr 19, 2021
08426b7
Merge branch 'main' into repo-sync
Octomerger Apr 19, 2021
a9be1ce
Merge branch 'main' into repo-sync
Octomerger Apr 19, 2021
061aba5
Merge pull request #18867 from github/repo-sync
Octomerger Apr 19, 2021
1e9a8eb
Merge pull request #5535 from github/repo-sync
Octomerger Apr 19, 2021
2668bb7
Clarifies `rebase-strategy` behavior (#18865)
asciimike Apr 20, 2021
d39ab5b
Merge branch 'main' into repo-sync
Octomerger Apr 20, 2021
a7d5917
Merge pull request #5548 from github/repo-sync
Octomerger Apr 20, 2021
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
Prev Previous commit
Next Next commit
Clarifies rebase-strategy behavior (github#18865)
  • Loading branch information
@asciimike
asciimike authored Apr 20, 2021
commit 2668bb798da7cc7c268cfadbb7e0d1bf4140d4bd
4 changes: 2 additions & 2 deletions ...-security/supply-chain-security/configuration-options-for-dependency-updates.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,12 +446,12 @@ updates:

#### `rebase-strategy`

By default, {% data variables.product.prodname_dependabot %} automatically rebases open pull requests when it detects conflicts. Use `rebase-strategy` to disable this behavior.
By default, {% data variables.product.prodname_dependabot %} automatically rebases open pull requests when it detects any changes to the pull request. Use `rebase-strategy` to disable this behavior.

Available rebase strategies

- `disabled` to disable automatic rebasing.
- `auto` to use the default behavior and rebase open pull requests when conflicts are detected.
- `auto` to use the default behavior and rebase open pull requests when changes are detected.

{% data reusables.dependabot.option-affects-security-updates %}

Expand Down