Commit e6df06d4 authored by Andrew Hutchings's avatar Andrew Hutchings Committed by Daniel Black

Update markdown files for `main` branch

Coding standards and PR template now reference `main`.
parent 7a65dcb5
...@@ -37,10 +37,9 @@ If the changes are not amenable to automated testing, please explain why not and ...@@ -37,10 +37,9 @@ If the changes are not amenable to automated testing, please explain why not and
<!-- <!--
Tick one of the following boxes [x] to help us understand if the base branch for the PR is correct. Tick one of the following boxes [x] to help us understand if the base branch for the PR is correct.
see [CODING_STANDARDS.md](https://github.com/MariaDB/server/blob/-/CODING_STANDARDS.md) for the latest versions.
--> -->
## Basing the PR against the correct MariaDB version ## Basing the PR against the correct MariaDB version
- [ ] *This is a new feature or a refactoring, and the PR is based against the latest MariaDB development branch.* - [ ] *This is a new feature or a refactoring, and the PR is based against the `main` branch.*
- [ ] *This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.* - [ ] *This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.*
<!-- <!--
......
...@@ -48,7 +48,7 @@ git push --force my_branch ...@@ -48,7 +48,7 @@ git push --force my_branch
### Target branch ### Target branch
Pull requests should be based against the correct MariaDB version. Pull requests should be based against the correct MariaDB version.
New features should be based against the latest MariaDB development branch, which is the current GitHub default branch: https://github.com/MariaDB/server/blob/-/VERSION New features should be based against the `main` branch, which is the GitHub default branch.
Bug fixes should be based against the earliest maintained branch in which the bug can be reproduced. Bug fixes should be based against the earliest maintained branch in which the bug can be reproduced.
The earliest maintained branch is found at https://mariadb.org/about/#maintenance-policy. The earliest maintained branch is found at https://mariadb.org/about/#maintenance-policy.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment