From 746d427af440e0909c9e8cbc6b4f473533bd6a8f Mon Sep 17 00:00:00 2001 From: Abdul Wadood Date: Sat, 26 Oct 2019 21:20:43 +0530 Subject: [PATCH] Remove hash from branch naming convention As zsh shows 'zsh: no matches found:' when checking out a branch with a # in it --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65c0e1ef6..bbadb2ffd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ Our branching strategy is based on [this article](https://nvie.com/posts/a-succe + **develop** the actively worked on next release of the app, what we branch off of while working on new features and what we merge into upon feature completion + **feature/** or feature/\/ any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted. Typically a feature branch is off of develop and into develop but in rare scenarios if there is an issue in production a branch may be made off master to fix this issue, this type of feature branch must be merged to develop and master before being deleted. -Branch names should be in the format **#\-kebab-case-title** +Branch names should be in the format **\-kebab-case-title** All branches should have distinct history and should be visually easy to follow, for this reason only perform merge commits when merging code either by PR or when synchronising.