34 | | * {{{bugfix/descriptive-name}}} for branches of {{{develop}}} that will be merged back to {{{develop}}}. For example, {{{bugfix/ticket-1234-error-msg-not-clear}}} |
35 | | * {{{hotfix/descriptive-name}}} for branches of {{{master}}} that will be merged back to {{{master}}} and also to {{{develop}}}. For example, {{{bugfix/ticket-1234-crash-if-result-negative}}} |
| 34 | * {{{bugfix/descriptive-name}}} for branches of {{{develop}}} that will be merged back to {{{develop}}} after the fix. For example, {{{bugfix/ticket-1234-error-msg-not-clear}}} |
| 35 | * {{{hotfix/descriptive-name}}} for branches of {{{master}}} that will be merged back to {{{master}}} and also to {{{develop}}} after the fix. For example, {{{hotfix/ticket-5678-crash-if-result-negative}}} |