Hi,
I have issues to define a correct strategy for merging branches of a development project.
I have a Trunk from which I have created 2 branches A and B.
Everyday, I do a merge of A onto the Trunk and next of B onto the Trunk.
But I don't merge the Trunk back on A and B! Changes done on A are therefore not reflected on B and vice-versa.
I have automated those "merge" using the 3way merge of BC3 in a batch where the Trunk of the previous day is used as an ancestor (a.k.a the Trunk -1).
I think now that using the Trunk "-1" is most probably an error. Shouldn't I do keep the original Trunk as an ancestor for any new daily merge? Or should I use a specific ancestor per branche, such as the A "-1" as an ancestor for the merge of A onto the Trunk and B "-1" as an ancestor for the merge of B onto the Trunk ?
Thx a lot in advance for your recommendation.
V.
I have issues to define a correct strategy for merging branches of a development project.
I have a Trunk from which I have created 2 branches A and B.
Everyday, I do a merge of A onto the Trunk and next of B onto the Trunk.
But I don't merge the Trunk back on A and B! Changes done on A are therefore not reflected on B and vice-versa.
I have automated those "merge" using the 3way merge of BC3 in a batch where the Trunk of the previous day is used as an ancestor (a.k.a the Trunk -1).
I think now that using the Trunk "-1" is most probably an error. Shouldn't I do keep the original Trunk as an ancestor for any new daily merge? Or should I use a specific ancestor per branche, such as the A "-1" as an ancestor for the merge of A onto the Trunk and B "-1" as an ancestor for the merge of B onto the Trunk ?
Thx a lot in advance for your recommendation.
V.
Comment