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: update rebasing documentation #9021

Merged

Conversation

HonkingGoose
Copy link
Collaborator

Changes:

This is in essence a copy/paste of the good stuff from PR #8029.

  • Reduce capitalization
  • Better explain that Renovate "rebase" is not Git rebase
  • Fix white space in ordered list
  • Let Markdown renderer worry about ordering the list
  • Rewrite manual rebasing section

Context:

Let's try this again in a docs only format... 😄

Helps with #7626.

The Renovate wizards will need to check if the descriptions are still accurate to the current Renovate back-end behavior, as that was recently changed.

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

@HonkingGoose HonkingGoose requested a review from rarkins March 7, 2021 19:40
@HonkingGoose HonkingGoose mentioned this pull request Mar 7, 2021
52 tasks
@viceice
Copy link
Member

viceice commented Mar 7, 2021

🧙🧙 😅

@HonkingGoose

This comment has been minimized.

@HonkingGoose

This comment has been minimized.

@rarkins
Copy link
Collaborator

rarkins commented Mar 7, 2021

I would think that renovate will not by default rebase every merge request, when something else is committed to the master branch.

This is either not correct or a misunderstanding. And now it's clearly documented when it will happen (which is not every time, by default).

I don't see any further action required.

@HonkingGoose

This comment has been minimized.

@HonkingGoose HonkingGoose marked this pull request as ready for review March 11, 2021 18:17
@HonkingGoose HonkingGoose requested a review from viceice March 12, 2021 10:30
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

LGTM

@HonkingGoose
Copy link
Collaborator Author

@rarkins What do you think of this?

@rarkins rarkins merged commit ba62c9f into renovatebot:master Mar 20, 2021
@HonkingGoose HonkingGoose deleted the docs/updating-rebasing-v2-simple branch March 20, 2021 21:20
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 24.90.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 20, 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.

4 participants