Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XS✔ ◾ fix protect-your-master-branch #6879

Merged
merged 3 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ index:
- do-you-know-how-to-manage-nuget-packages-with-git
- do-you-know-how-to-programmatically-get-git-commits
- the-levels-to-git-mastery
- protect-your-master-branch
- protect-your-main-branch
- rebase-not-merge
- the-golden-rule-of-rebasing
- clean-up-stale-remote-branches-in-git
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,44 +1,43 @@
---
type: rule
title: Do you protect your main branch? aka branch protection
uri: protect-your-main-branch
authors:
- title: Adam Cogan
url: https://ssw.com.au/people/adam-cogan
- title: Matt Wicks
url: https://ssw.com.au/people/matt-wicks
- title: Gordon Beeming
url: https://www.ssw.com.au/people/gordon-beeming/
- title: Jernej Kavka
url: https://ssw.com.au/people/jernej-kavka
related: []
redirects:
- do-you-protect-your-master-branch
created: 2017-09-12T22:35:37.000Z
archivedreason: null
guid: 93bfec41-6b37-4413-a660-931fffa88d44
---

Branch protection is a feature in version control software that allows teams to define rules and restrictions around who can make changes to specific branches, what types of changes are allowed, and if there are conditions that have to be met.

<!--endintro-->

This can include:

- number of reviewers
- linked work items e.g. PBIs (super useful to track back to why the code was changed)
- any feedback has been addressed/resolved
- enforcing specific merge types
- checking that builds pass
- checking other services e.g. code quality like SonarQube
- automatically adding specific people to review the code


::: bad
![Figure: Bad example – no protection – anyone can make unreviewed changes](protect-branch-bad.jpg)
:::


::: good
![Figure: Good example – the branch protected](protect-branch-good.jpg)
:::
---
type: rule
title: Do you protect your main branch? aka branch protection
uri: protect-your-main-branch
authors:
- title: Adam Cogan
url: https://ssw.com.au/people/adam-cogan
- title: Matt Wicks
url: https://ssw.com.au/people/matt-wicks
- title: Gordon Beeming
url: https://www.ssw.com.au/people/gordon-beeming/
- title: Jernej Kavka
url: https://ssw.com.au/people/jernej-kavka
related: []
redirects:
- do-you-protect-your-master-branch
- protect-your-master-branch
created: 2017-09-12T22:35:37.000Z
archivedreason: null
guid: 93bfec41-6b37-4413-a660-931fffa88d44
---

Branch protection is a feature in version control software that allows teams to define rules and restrictions around who can make changes to specific branches, what types of changes are allowed, and if there are conditions that have to be met.

<!--endintro-->

This can include:

- Number of reviewers
- Linked work items e.g. PBIs (super useful to track back to why the code was changed)
- Any feedback has been addressed/resolved
- Enforcing specific merge types
- Checking that builds pass
- Checking other services e.g. code quality like SonarQube
- Automatically adding specific people to review the code

::: bad
![Figure: Bad example – No protection – anyone can make unreviewed changes](protect-branch-bad.jpg)
:::

::: good
![Figure: Good example – The branch protected](protect-branch-good.jpg)
:::
Binary file not shown.
Binary file not shown.
Loading