Another GitFlow question for you :)
Can you help me understand the right procedure to apply in the case below?
I want to start the development of a new big FeatureA starting from the develop branch. Because FeatureA is big and complex, so I want to have multiple MR to facilitate the reviewer's life.
What I usually do is:
- Cutting a branch from develop called FeatureA_Base
- Immediately cutting a branch from FeatureA_Base called FeatureA_1 to start working
- When I reach a certain amount of change then I cut the FeatureA_2 branch from FeatureA_1 and I keep doing this until the development is complete a the branch FeatureA_n
- To keep my branches up to date with develop I often merge develop into FeatureA_Base and FeatureA_Base into FeatureA_1 (this is repeated until I merge FeatureA_n-1 into FeatureA-n)
The problem comes at the point of merging everything together because I get a lot of conflicts that I don't understand. I want to highlight that I only use merge and not rebase but when I start to merge all together I can't avoid having tons of conflicts.
What I tried to do is start to merge FeatureA_n into FeatureA_n-1, repeating the process until I merge FeatureA_1 into FeatureA_Base. As well I tried the other way around, merging FeatureA_1 into FeatureA_Base, then FeatureA_2 into FeatureA_Base, and so on until merging FeatureA_n into FeatureA_Base.
In both cases, I was getting a lot of conflicts...
Any suggestion on how to improve this process?
Thanks a lot :)