MPA

From the to-do list: V.1.0 Release

✔ Get branching clean

Comments

Pierre henri Seylan on October 24, 2015:


Context:

Before the first release of the app, it is important to get a cleaner GIT workflow.

Currently:
  • the client is developed on a main "develop" branch
  • Developers create private branch, for daily development

From now on:

There is the following main branch:
  • Client development


rename the current develop branch, and replace the existing olds branches, (Alex, Andrey etc)
Make sure that the Jenkins builds are still working with the new Client-Develop branch

Process to add new features:
  • Branch off the Client development branch
  • create a new branch named "Feature-keywords"
  • keywords means a few words that shows what the branch is about, for example "Feature: media lib new sorting options"
  • develop the feature
  • provide test builds
  • once approved, merge back to Client development branch

Process to fix bugs:
  • Branch off from the Master branch
  • create a new branch named "Hotfix-keywords"
  • fix the issue
  • provide test builds
  • once approved, merge back to develop branch

Pierre henri Seylan on March 24, 2016:


Th merged version of the client should be pushed to a branch called:
client-release 

then we will fix the issues on the dev branch and push to the release branch when ready

the builds for the app distribution will be always the one of this branch

the release branch will also be the one where certain panels are hidden, e.g chat, however on the dev branch all the panels should be visible