schmunk42/gii-template-collection

Clarify branch usage

Closed this issue · 2 comments

Right now, there is "release" branch which has the latest released and unreleased code, "development" branch with a bit older code and a new merge and "master" with really old code.

I suggest we use https://github.com/nvie/gitflow for managing development, feature and release-branches.

Yeah, sorry for that.
I was not able to merge back-to-the-roots back into master.

Feel free to make master contain the latest code again. We could drop development then.

Done