diff --git a/basics.html b/basics.html index 84f3199eec35f4938c995d79889df426e34bbd77..5b6ff3aec87c654704dda981411cdeabcf0b1ee5 100644 --- a/basics.html +++ b/basics.html @@ -697,6 +697,26 @@ - make changes in playground </section> + <section id="branch-names" data-markdown> + ## branch naming + ### conventions + + - dashes in names + - slashes for categories + + ```markdown + topic/ui/input-form + wip/test-different-fonts + hotfix/42 + release/1.6.0 + ``` + + notes: + - `git branch --list 'topic/*'` + - decide with your team + - write CONTRIBUTING.md + </section> + <section id="merging" data-markdown> ## resolving branches