Reverting merge commit

2019-02-17 Thread Roman Gelfand
Consider the following... 1. Release Branch 2. Each of the 3 developers are working on their own features. Each feature is a branch. Only one developer is working on each feature. 3. When a feature changes have been made, the feature branch is merged into the release branch. 4. After the merge i

Hotfix Branching Strategy

2019-02-11 Thread Roman Gelfand
At any one time, up to 3 developers could be developing hotfixes addressing issues.Whether it is one or multiple people working on hotfixes, we always want to produce one hotfix. Each hotfix is a cumulative update since beginning of release. Just about every hotfix requires database upgrade.