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✔ ◾ Update branching in git rule to link to branch naming rule #9760

Merged
merged 2 commits into from
Jan 10, 2025
Merged
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
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
Loading