Implementing gitflow and merging from feature to release

[rajanibs]

Hi All,

We recently tried to implement a custom gitflow model.

1. develop branch -> developers to release and test their changes
2. test branch -> for sprint releases for releasing only fully completed stories

Follow below steps:

1.  Feature branch created from test (stable one)
2. Changes done in feature branch - probably for one story
3. Tested in developer's local system
4. To move the changes to development environment for integrated developer testing
   1. developer pulls the latest from develop (develop has changes which are not fully ready)
   2. merge the changes from feature to develop
5. Tested the changes in development environment
6. To move the changes to 'test' branch
   1. developer pulls the latest from test
   2. merge the changes from feature to test

Problem - with 4.1, feature branch is now having changes from other developers, because it pulls the latest. So, when developer does #6, he merges his changes as well as other developer's changes, which may not be fully completed from development.

Our intention was to have only fully completed/tested changes in 'test' branch.  Please share some ideas.