mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update markdown files for main branch

Browse source 
Coding standards and PR template now reference `main`.
This commit is contained in:
Andrew Hutchings 2024-08-27 13:40:39 +01:00 committed by Daniel Black
parent 7a65dcb59e
commit e6df06d40d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/pull_request_template.md vendored
View file

@ -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.*
<!-- <!--

2
CODING_STANDARDS.md
View file

@ -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.