You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: developer_manual/getting-started/branch-policies.rst
+6-6Lines changed: 6 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -3,7 +3,7 @@ Branch policies
3
3
4
4
This document describes the branching model used in LibreSign and how contributions should be targeted.
5
5
6
-
Branch Names
6
+
Branch names
7
7
------------
8
8
9
9
Main
@@ -42,7 +42,7 @@ Stable branches maintain release lines compatible with a specific **Nextcloud Se
42
42
In LibreSign, ``min-version`` and ``max-version`` are always the same number.
43
43
This number is the MAJOR version of the compatible Nextcloud Server.
44
44
45
-
Target Branches for Contributions
45
+
Target branches for contributions
46
46
---------------------------------
47
47
48
48
- **New features / improvements**:
@@ -61,18 +61,18 @@ Target Branches for Contributions
61
61
- Create a branch from that stable branch.
62
62
- Open a PR to the same stable branch.
63
63
64
-
Bugfixes and Backports
64
+
Bugfixes and backports
65
65
----------------------
66
66
If a bug fix also needs to be applied to an older release line, it must be **backported**.
67
67
Backporting means applying the same change to another branch (Git calls this *cherry-picking*).
68
68
69
-
Automatic Backport
69
+
Automatic backport
70
70
^^^^^^^^^^^^^^^^^^
71
71
If the cherry-pick applies cleanly and only small conflicts need to be resolved, the `backport bot <https://github.com/nextcloud/backportbot>`_ can be used.
72
72
73
73
See the `bot usage <https://github.com/nextcloud/backportbot#usage>`_ for available commands.
74
74
75
-
Manual Backport
75
+
Manual backport
76
76
^^^^^^^^^^^^^^^
77
77
For more complex changes, the backport must be done manually:
78
78
@@ -93,6 +93,6 @@ For more complex changes, the backport must be done manually:
93
93
94
94
# Open a pull request for the backport
95
95
96
-
Creating Branch
96
+
Creating branch
97
97
---------------
98
98
Follow the convention of naming branches as ``feature/description`` or ``bugfix/description``.
0 commit comments