How Kibana is managing the github branching for older versions?

I have added kibana respo. as upstream remote in my repository. Currently , I am using kibana 5.6 branch and I have created my local branch from kibana 5.6 branch. Now I want to to upgrade it to kibana 6.8 branch. But kibana 6.x branch is deleted and and as per Kibana Contributor guideline most of the major versions is releasing from {majorVersion}.x branch.

I just want to know how the kibana maintaining branching structure ? Which branches are useful for release and which branches are used for development purpose and what is the role of master branch ?

Hi @hardik.rapidops,

The 6.x branch has been deleted because the last minor release in 6.x was 6.8, and there are currently no plans to release a 6.9. Therefore, the 6.8 branch is what would be used for any future patch releases (like 6.8.1).

The master branch is the first place new changes get merged, and always tracks against the next major release. So as of today, code in master is what will eventually be released as 8.0.0. With very few exceptions, nearly all code will get merged to master first, then backported to whichever other branches need those changes.

We do not cut separate branches for patch versions, rather those are simply tagged, e.g. v6.8.0. Therefore, if you are looking for the code that was released in a particular version, it's best to use the tags (which you'll also find listed under the "Releases" tab in the repo).

How can I get the 6.x branch commit history ? Let's say suppose I am creating one new branch in my local called 6.x and I am merging all other branches starting from 6.0 to 6.8. Then does it will work ?

You shouldn't need to merge a bunch of branches to recreate 6.x.

The previous 6.x branch was "converted" to the 6.8 branch at the time v6.8.0 was released. So if you want to recreate 6.x, you can use the 6.8 branch and exclude any commits that were added after the v6.8.0 release. (Since those commits are what will eventually be part of 6.8.1).

Or even better, you could create a new 6.x branch from the v6.8.0 tag:

git checkout -b 6.x v6.8.0

This will give you the 6.x branch as it existed at the time of the 6.8 release.

@lukeelmers Thank you so much. You resolved my issue. I really appreciate it.

This topic was automatically closed 28 days after the last reply. New replies are no longer allowed.