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.

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

docs: rebaseWhen=conflicted + automerge #9031

Merged
merged 3 commits into from
Mar 8, 2021
Merged

Conversation

rarkins
Copy link
Collaborator

@rarkins rarkins commented Mar 8, 2021

Changes:

Elaborates on why not to have rebaseWhen=conflicted + automerge

Context:

Closes #8988

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added unit tests, or
  • No new tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

docs/usage/configuration-options.md Outdated Show resolved Hide resolved
docs/usage/configuration-options.md Outdated Show resolved Hide resolved
docs/usage/configuration-options.md Outdated Show resolved Hide resolved
@rarkins rarkins merged commit dda7514 into master Mar 8, 2021
@rarkins rarkins deleted the docs/rebase-when-conflicted branch March 8, 2021 12:59
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 24.77.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update rebaseWhen docs and update text in Renovate PR body
3 participants