Review the application gitflow branching model

[rogeriopradoj]

Hello,

I just like to suggest reviewing the application gitflow branching model because, IMHO, it's not being applied appropriately in this repo nowadays (mainly because of tags, master branch and 2-2-stable branch) even with https://github.com/EllisLab/CodeIgniter/blob/develop/contributing.md#branching pointing it should be.

In time: https://danielkummer.github.io/git-flow-cheatsheet/index.html or the original blog post http://nvie.com/posts/a-successful-git-branching-model/.

Points to be reviewed, again, IMHO:

• master branch must ALWAYS have the latest stable version and MUST be git tagged with a release version number
• 2.2-stable branch, while it's the latest stable version, MUST mirror master branch completely
• the last commit in branch that retains the latest stable code (master as a main branch in gitflow model) MUST have the git tag of the latest stable release version number.

Suggestion to solve the points right now:

1. in 2.2-stable BUMP VERSION to 2.2.1 release containing the bug fix CI 2.2.0 - pdo: rowCount non-object error because $this->result_id is not an object #3095
2. merge 2.2-stable into master
3. in master, git tag 2.2.1 and release it (http://ellislab.com/codeigniter)
4. if the 2.2-stable branch is not intended to be used as the latest stable code (according to the gitflow model), but as a supporting branch one step before the code get into the latest stable branch (master), rename it in order to not confusing contributors and users as well. Maybe just 2.2 (as https://github.com/symfony/symfony/tree/2.5) or CI-2.2 (as https://github.com/php/php-src/tree/PHP-5.6).

Thanks in advance for taking a look on this!

[rogeriopradoj]

Hi, @narfbg, any thoughts on this?

[narfbg]

I wouldn't be able to put my thoughts in a polite way. Ultimately, it's not a real problem, nor something you should be dealing with.

[rogeriopradoj]

Thanks, man, see ya!