docs(faq): reorder sections (#12666)

This commit is contained in:
HonkingGoose 2021-11-15 12:04:40 +01:00 committed by GitHub
parent d666caad01
commit fba47734a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -18,19 +18,6 @@ Renovate will:
- Update `yarn.lock` and/or `package-lock.json` files if found - Update `yarn.lock` and/or `package-lock.json` files if found
- Create Pull Requests immediately after branch creation - Create Pull Requests immediately after branch creation
## What is this `main` branch I see in the documentation?
When you create a new repository with Git, Git creates a base branch for you.
The default branch name that Git uses is `master` (this will be changed to `main` later).
The Git-hosting ecosystem has settled on using `main` to replace `master`.
When you create a new repository on say GitHub or GitLab, you'll get a `main` branch as your base branch.
It therefore makes sense for Renovate to replace `master` with `main` where possible as well.
A branch name has no special meaning within the Git program, it's just a name.
The base branch could be called `trunk` or `mainline` or `prod`, and Git would work just as well.
## Which Renovate versions are officially supported? ## Which Renovate versions are officially supported?
The Renovate maintainers only support the latest version of Renovate. The Renovate maintainers only support the latest version of Renovate.
@ -56,6 +43,19 @@ Some major platform features are not supported at all by Renovate.
| Merge trains | GitLab | [#5573](https://github.com/renovatebot/renovate/issues/5573) | | Merge trains | GitLab | [#5573](https://github.com/renovatebot/renovate/issues/5573) |
| Configurable merge strategy and message | Only BitBucket for now | [#10867](https://github.com/renovatebot/renovate/issues/10867) [#10868](https://github.com/renovatebot/renovate/issues/10868) [#10869](https://github.com/renovatebot/renovate/issues/10869) [#10870](https://github.com/renovatebot/renovate/issues/10870) | | Configurable merge strategy and message | Only BitBucket for now | [#10867](https://github.com/renovatebot/renovate/issues/10867) [#10868](https://github.com/renovatebot/renovate/issues/10868) [#10869](https://github.com/renovatebot/renovate/issues/10869) [#10870](https://github.com/renovatebot/renovate/issues/10870) |
## What is this `main` branch I see in the documentation?
When you create a new repository with Git, Git creates a base branch for you.
The default branch name that Git uses is `master` (this will be changed to `main` later).
The Git-hosting ecosystem has settled on using `main` to replace `master`.
When you create a new repository on say GitHub or GitLab, you'll get a `main` branch as your base branch.
It therefore makes sense for Renovate to replace `master` with `main` where possible as well.
A branch name has no special meaning within the Git program, it's just a name.
The base branch could be called `trunk` or `mainline` or `prod`, and Git would work just as well.
## What if I need to .. ? ## What if I need to .. ?
### Troubleshoot Renovate ### Troubleshoot Renovate