Because we had branches that were merged into master prematurely and had to be un-merged from master, this makes things difficult when we need to merge them back in again - we need to revert the un-merging which is a mess.
To keep this from happening again and wasting valuable time on dealing with unmerging merges and remerging the merges:
We should have two constant branches, master and development.
Feature branches are branched off of development.
Once features have been implemented, they are merged back into development.
Once development is at a stable point, it can be merged into master.
Because we had branches that were merged into
masterprematurely and had to be un-merged frommaster, this makes things difficult when we need to merge them back in again - we need to revert the un-merging which is a mess.To keep this from happening again and wasting valuable time on dealing with unmerging merges and remerging the merges:
masteranddevelopment.development.development.developmentis at a stable point, it can be merged intomaster.master.