Following is the scenario and I would like to understand and possibly write steps for team members - "how to" Scenario: As in any real world scenario we have Master. Story branches are created and worked upon and pushed to Master. This is for continuous integration. Then we have releases As I understand the way how they are now setup is to use tags for release.
Question that I have :
Due to the way application is, we need to have our own project branch say "A1" now and That has been created from Master. An automated job will pull master into "A1" periodically ( conflicts will be alerted and we take care of it in "A1"
I will ask my team members to create feature story branches from A1
Say 2 developers have now created C2 and B4 branches from A1 and after they are done, they will remain as C2 and B4 branches, but also need to merge to A1, so next feature story branch E7 can pick up things done in C2/B4 during the phase of A1 project.
Please help with steps to achieve this.
How do I do feature-story merges into A1 ( and is that correct todo so), before finally merging it into master?
I also do not completely get if ( & how) are features rebased with A1 and is that needed at all?
Appreciate all your help. Thanks.