Best practices to install Studio Patch when using multiples git branches

[FPellissier1625558358]

Hello,

I would like to know you have some Best Practices to share for poeple using Git branches ?

For example if we have the following branches : master / develop / feature_1 / feature_2/ ...

For that I understand, the Studio will perform the "migration" on each branch individually when we open it. And I'm afraid that it would mess with the modifications during the Pull&Merge for the gitflow.

Do we have to finalize all feature branches before applying it ?

Is there a preferential order to migration the branches ?

Or everything will work seamlessly ?

Regards,

François

[Anonymous]

Hi Francois,

There is no straight way to apply the patches to all the branches. The Git best practice will come handy in such situations. You will have to give a logical end to the sub-branches, apply the patch to the development or feature branch and then do pull to reflect it to all the branches. When you reach a milestone, it will automatically be applied to the master branch.

Thanks,

RekhaSree

[FPellissier1625558358]

Thanks for your answer.

What kind of modifications are done to the job files during the patch installation? Does the conflicts resolution tool handle it well?