rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Merge strategy (markdown)

Janek Bevendorff
2017-01-29 14:46:32 +01:00
parent fd012a0c73
commit 033be9dcc7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Merge-strategy.md

@@ -9,7 +9,7 @@ In addition to these two branches, there are several short-lived branches with d
*Merge back into:* `develop`
- **`release/<x.y.z>`**: release preparation branch for version *&lt;x.y.z&gt;*, marks beginning of feature freeze<br>
*Branch from:* `develop`<br>
*Merge back into:* `develop`, `master`
*Merge back into:* `master`
- **`hotfix/<issue#-description>`**: maintenance branch for bugfixes in released versions<br>
*Branch from:* `release/<x.y.z>`<br>
*Merge back into:* `release/<x.y.z>`, `develop`