Love Fuel?    Donate

Thoughts, ideas, random notes, ramblings...

Anything about PHP in general, and FuelPHP in particular. Sometimes serious, sometimes with a big wink. But always with a message. Do you have an opinion about an article? Don't forget to comment!

We have changed our Git branches around.  We have done this to help ourselves, and you as well.  The new branching architecture will help us get bug fixes out there faster and with less errors.

The first thing you will notice is that there is no more "master" or "develop" branches.  We are now prefixing all branch names with their major/minor version number.  Here are the new branches as they stand now:

1.0/master - The current release of the 1.0 branch.

1.0/develop - The bleeding edge of the 1.0 branch.  All critical bug fixes for the 1.0 branch should be done here...this includes pull requests for critical bug fixes to the current version.

1.1/develop - The "new hottness" (as the cool kids say).  This is where all work for the next minor release goes.  Changes from 1.0/develop will be merged back into this branch where applicable.

You may notice the absense of the 1.1/master branch...this is by design.  That branch will be created once we start with the beta and release candidates for that version.

Please make sure you do all pull requests on the appropriate branch.

Previous Release Support

Since 1.1 development has begun we should touch on how we will support previous versions.  Here is our official policy:

We will fully support the last two (2) versions of the framework.  A version is defined as a Major or Minor release (e.g. 1.0 and 1.1).  Bug fix releases (e.g. 1.0.1) are considered part of the minor version release (e.g. 1.0).

We will support the previous version for at least 6 months.  This time may be expanded dependant on the next version release schedule.

Support is defined as critical bug fix and security releases.  This does not constitute application support.

If you have any questions, let us know.