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: docs/developer/contributing/development-github.asciidoc
+17-13Lines changed: 17 additions & 13 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,5 +1,5 @@
1
1
[[development-github]]
2
-
== How we use git and github
2
+
== How we use Git and GitHub
3
3
4
4
[discrete]
5
5
=== Forking
@@ -12,17 +12,21 @@ repo, which we'll refer to in later code snippets.
12
12
[discrete]
13
13
=== Branching
14
14
15
-
* All work on the next major release goes into master.
16
-
* Past major release branches are named `{majorVersion}.x`. They contain
17
-
work that will go into the next minor release. For example, if the next
18
-
minor release is `5.2.0`, work for it should go into the `5.x` branch.
19
-
* Past minor release branches are named `{majorVersion}.{minorVersion}`.
20
-
They contain work that will go into the next patch release. For example,
21
-
if the next patch release is `5.3.1`, work for it should go into the
22
-
`5.3` branch.
23
-
* All work is done on feature branches and merged into one of these
24
-
branches.
25
-
* Where appropriate, we'll backport changes into older release branches.
15
+
At Elastic, all products in the stack, including Kibana, are released at the same time with the same version number. Most of these projects have the following branching strategy:
16
+
17
+
* `master` is the next major version.
18
+
* `<major>.x` is the next minor version.
19
+
* `<major>.<minor>` is the next release of a minor version, including patch releases.
20
+
21
+
As an example, let's assume that the `7.x` branch is currently a not-yet-released `7.6.0`. Once `7.6.0` has reached feature freeze, it will be branched to `7.6` and `7.x` will be updated to reflect `7.7.0`. The release of `7.6.0` and subsequent patch releases will be cut from the `7.6` branch. At any time, you can verify the current version of a branch by inspecting the `version` attribute in the `package.json` file within the Kibana source.
22
+
23
+
Pull requests are made into the `master` branch and then backported when it is safe and appropriate.
24
+
25
+
* Breaking changes do not get backported and only go into `master`.
26
+
* All non-breaking changes can be backported to the `<major>.x` branch.
27
+
* Features should not be backported to a `<major>.<minor>` branch.
28
+
* Bugs can be backported to a `<major>.<minor>` branch if the changes are safe and appropriate. Safety is a judgment call you make based on factors like the bug's severity, test coverage, confidence in the changes, etc. Your reasoning should be included in the pull request description.
29
+
* Documentation changes can be backported to any branch at any time.
26
30
27
31
[discrete]
28
32
=== Commits and Merging
@@ -109,4 +113,4 @@ Assuming you've successfully rebased and you're happy with the code, you should
109
113
[discrete]
110
114
=== Creating a pull request
111
115
112
-
See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.
116
+
See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.
0 commit comments