Difference between master and RELENG_2_1 branches in Github

[ssheikh]

A bit confused between the different braches on Github. Can someone point me in the direction where these are discussed.

Should I be doing commits to RELENG_2_1 branch or master?

Thanks,

Shahid

[jimp]

Master is the most current code ahead of 2.1 (e.g. what will be 2.2)

We branched 2.1 because it was nearing release, so master could be opened for more intrusive changes again.

If a commit is a bug fix for 2.1, it should actually be done on both master and RELENG_2_1 (or done on one and cherry-picked to the other)

New features would be for master only at this point.

[ssheikh]

Thx.

So if I cherry-pick a commit from one branch to the other, I have to submit a pull request for each branch separately right?

[jimp]

Yes, assuming the commit is critical enough to be accepted for 2.1