Skip to content

Commit

Permalink
XS✔ ◾ Update branching in git rule to link to branch naming rule (#9760)
Browse files Browse the repository at this point in the history
* Update branching in Git rule

Added links the the branch naming convention rule

* Fixed missing image alt
  • Loading branch information
christianmorfordwaitessw authored Jan 10, 2025
1 parent d2b27a5 commit f09391f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 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 All @@ -28,7 +29,7 @@ Using this strategy, **master** is always production-ready and deployable.

<!--endintro-->

![](finishing-a-feature-with-world-class-flow.jpg)
![Finishing a Feature with World Class Flow](finishing-a-feature-with-world-class-flow.jpg)

::: greybox
**Note:** This rule applies to git. For branching advice in TFVC, see [when to branch](/do-you-know-when-to-branch).
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 f09391f

Please sign in to comment.