Skip to content

Commit 785cfdb

Browse files
authored
Merge pull request #227 from NHSDigital/default-branch-name
Default branch name: "master" to "main"
2 parents 287c320 + 001f5fa commit 785cfdb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

insights/review.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Finally (and most importantly) identify actions to move the score upward.
8585
* It keeps us aligned and working well as a team.
8686
* It helps us share and resolve impediments.
8787
* All our code is stored in source control (e.g. git).
88-
* We practice [trunk-based development](https://trunkbaseddevelopment.com/) using short-lived feature branches off master.
88+
* We practice [trunk-based development](https://trunkbaseddevelopment.com/) using short-lived feature branches off the main branch.
8989
* All code must be reviewed before it is merged.
9090
* Tests must pass before code is merged.
9191
* We can see when the build has broken or tests are failing and we fix them before carrying on.

patterns/everything-as-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Everything (including [infrastructure](../practices/cloud-services.md)) should b
1919
* All code is treated the same (e.g. application code, infrastructure code, test code, etc).
2020
* All code is [peer-reviewed](#code-review) and tested.
2121
* All code is version controlled.
22-
* The mainline branch (e.g. `master`) is protected: no force-pushes are allowed and code reviews, tests and any other automated checks must pass before pull/merge requests can be merged. Administrators should be subject to the same rules.
22+
* The mainline branch (e.g. `main`) is protected: no force-pushes are allowed and code reviews, tests and any other automated checks must pass before pull/merge requests can be merged. Administrators should be subject to the same rules.
2323
* In general, squash merges are preferred for cleaner history. This does rely on merges being small, as should be the practice in any case.
2424
* Code changes should be automatically checked for code quality using tools like [SonarQube](../tools/sonarqube.md) (as well as via IDE plugins).
2525
* Code should be automatically scanned for secrets or other sensitive data (see [security](../practices/security.md) for details)

0 commit comments

Comments
 (0)