Skip to content

Commit

Permalink
Update branching in Git rule
Browse files Browse the repository at this point in the history
Added links the the branch naming convention rule
  • Loading branch information
christianmorfordwaitessw authored Jan 9, 2025
1 parent 407c306 commit 4b863c0
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions rules/do-you-know-when-to-branch-in-git/rule.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ authors:
url: https://ssw.com.au/people/gabriel-george
related:
- do-you-use-the-best-deployment-tool
- branch-naming
redirects: []
---

Expand Down Expand Up @@ -70,11 +71,11 @@ Figure: Bad example - Branch name is not descriptive
:::

```console
git branch create-basic-web-application
git branch feature/1234-create-basic-web-application
```

::: good
Figure: Good example - Branch name describes the intent of the change
Figure: Good example - Branch name describes the intent of the change and follows a [branch naming convention](/branch-naming)
:::

**It is critical that this branch always comes off master, not another feature branch. Master is the only branch that is mandated to be in a deployable state, so any other option is unsafe.**
Expand Down

0 comments on commit 4b863c0

Please sign in to comment.