From f09391ff1ba721480dbc018979fba80048e08e6d Mon Sep 17 00:00:00 2001 From: "Christian Morford-Waite [SSW]" Date: Fri, 10 Jan 2025 11:10:22 +1100 Subject: [PATCH] =?UTF-8?q?XS=E2=9C=94=20=E2=97=BE=20Update=20branching=20?= =?UTF-8?q?in=20git=20rule=20to=20link=20to=20branch=20naming=20rule=20(#9?= =?UTF-8?q?760)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update branching in Git rule Added links the the branch naming convention rule * Fixed missing image alt --- rules/do-you-know-when-to-branch-in-git/rule.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/do-you-know-when-to-branch-in-git/rule.md b/rules/do-you-know-when-to-branch-in-git/rule.md index 69aa2541e28..93c66c65a87 100644 --- a/rules/do-you-know-when-to-branch-in-git/rule.md +++ b/rules/do-you-know-when-to-branch-in-git/rule.md @@ -19,6 +19,7 @@ authors: url: https://ssw.com.au/people/gabriel-george related: - do-you-use-the-best-deployment-tool + - branch-naming redirects: [] --- @@ -28,7 +29,7 @@ Using this strategy, **master** is always production-ready and deployable. -![](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). @@ -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.**