View Full Version : [Workflow] Reorganizing code repository

12-12-2016, 04:22 PM
I have made some changes to our Bitbucket repository (https://bitbucket.org/oscmax/oscmax2). The master branch is now main branch. It contains the latest stable release, which at this time is 2.5.4.

I added the develop branch. This is always the branch that contains the code for the next release (whatever that may be) and it is a full replacement for the 2.5.5 branch. The version number is not important, just that whatever is there will be pulled into the master when we release the next version. It will be tagged at that point and develop will then continue on with whatever the NEXT version is after that. Nice and clean.

Any new feature branches will branch from develop.

Any hotfix branches for master will branch off master and then merged back into master AND develop in the clone and then added to the origin via a pull request.

So the origin structure will always look like this


Any hotfixes or features will branch as follows:



All critical bugs found in the master/current release will always branch off master and when the fix is merged back into the master AND develop, the hotfix branch is closed.

All new features that may break the develop branch should create new branch from develop and do all development separately so that the develop branch is always functional. When the feature is complete, the feature branch is merged back into the main develop branch, tagged and closed.

Next, currently in the origin repository we have the following branches and I want to remove most of them, and reorganize the remaining branches to follow the above format:

[EDIT 12/13/2016 - These are remaining branches. Bootstrap-PGM should be removed, but want to confirm!]

master - main branch - Keep
develop - development branch - Keep
Bootstrap-for-2.5.5 - Should be a feature branch off develop
Bootstrap-PGM - this should be closed

I am not going to take any action on these until we have determined what each of the branches are for as I don't want to accidentally ruin anyone's day.

This is a good start. There is a lot more detail to add and discuss. Let me know your thoughts.

12-12-2016, 04:59 PM
Yup. "ridexbuilder" can go.. it hasn't been used.

12-12-2016, 06:42 PM
It looks like your branch 'ridexbuilder' has 43 commits that are not in 2.5.4 (master). Do you want to preserve your work before I remove it from the repo?

12-13-2016, 12:35 AM
It looks like your branch 'ridexbuilder' has 43 commits that are not in 2.5.4 (master). Do you want to preserve your work before I remove it from the repo?
Probably a lot of rubbish in there due to not having a clue about push/pull etc. I tried to find out what I had added, if anything and couldn't, so just delete.

12-13-2016, 11:37 AM
Please close Bootstrap-PGM

I think I have switched the branch for Bootstrap-for-2-5-5 to the develop branch.