About experimental git branch workflow

We need a experimental branch besides master which is used for experimenting with new ideas or big changes which may not be successful in the end and not appropriate to mix with other development having less impact. This new branch suggests the review is also separated from the one for the master branch.

So here is the process when we want to try a new unstable feature:

git clone https://github.com/stackforge/powervc-driver
git review -s

git checkout -b experimental origin/experimental
git checkout -b bug/xxxxxxx
<commits>
git review experimental

When the review workflow is done, our changes will be merged into experimental branch. And when it is stable at some time, we can let the experimental branch rebase onto master and then merge the two with no-ff.

git checkout experimental
git rebase master
git checkout master
git merge --no-ff experimental