Skip to content

Commit 1cd7868

Browse files
committed
Create new main branch
1 parent 623450f commit 1cd7868

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: ci
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
permissions:
77
contents: write
88
jobs:

docs/guides/developer_workflows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ When working with Git most teams use one of two different workflows depending on
55
- [Feature branch workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow) (also known as [GitHub flow](https://guides.github.com/introduction/flow/))
66
- [Gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
77

8-
Though FBW is the simpler of the two, it should be used by teams that are confident whenever they change the **main** branch it still remains ready for production ([main is always shippable](https://github.com/DEFRA/software-development-standards/blob/master/docs/principles/coding_principles.md#main-is-always-shippable)).
8+
Though FBW is the simpler of the two, it should be used by teams that are confident whenever they change the **main** branch it still remains ready for production ([main is always shippable](https://github.com/DEFRA/software-development-standards/blob/main/docs/principles/coding_principles.md#main-is-always-shippable)).
99

1010
Gitflow is useful for teams that like the space to combine multiple features, or are working on a large feature, before then shipping to production.
1111

@@ -31,7 +31,7 @@ In all cases when the branch is created it should be pushed up to the **origin**
3131

3232
Using this workflow it means our branches have specific uses
3333

34-
- **main** is the version of code that is in production (see the principle [main is always shippable](https://github.com/DEFRA/software-development-standards/blob/master/docs/principles/coding_principles.md#main-is-always-shippable))
34+
- **main** is the version of code that is in production (see the principle [main is always shippable](https://github.com/DEFRA/software-development-standards/blob/main/docs/principles/coding_principles.md#main-is-always-shippable))
3535

3636
- We create a **Hotfix** branch when we need to make a change to production code because of a critical error. When finished we merge the change back into main, but also Develop
3737

docs/processes/pull_requests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We also want to respect the time and effort of those reviewing the work. Keeping
1111

1212
## Always on a branch
1313

14-
No matter how small the change, all changes should be done on a branch and never directly to `main`. This is to support the principle of [main is always shippable](https://github.com/DEFRA/software-development-standards/blob/master/docs/principles/coding_principles.md#main-is-always-shippable)
14+
No matter how small the change, all changes should be done on a branch and never directly to `main`. This is to support the principle of [main is always shippable](https://github.com/DEFRA/software-development-standards/blob/main/docs/principles/coding_principles.md#main-is-always-shippable)
1515

1616
Clone the repo then create your new branch. For example `git checkout -b add-ea-admin-area-lookup`.
1717

docs/standards/quality_assurance_standards.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ By default, use [Jira](https://www.atlassian.com/software/jira) to manage bugs a
6060

6161
## Code quality testing
6262

63-
Automated test code must meet Defra [common coding standards](https://github.com/DEFRA/software-development-standards/blob/master/standards/common_coding_standards.md) wherever applicable.
63+
Automated test code must meet Defra [common coding standards](https://github.com/DEFRA/software-development-standards/blob/main/standards/common_coding_standards.md) wherever applicable.
6464

6565
All development and test code must undergo regular linting to check that it meets minimum standards.
6666

0 commit comments

Comments
 (0)