> I am having some issues with merging that I could use some advice
> on, please.
>
> I have a trunk and a customer branch.
> The decision has been made that all features belonging to the
> branch need to be added back into the trunk.
>
> Changes have also been ongoing in the trunk too.
>
> Is t
A merge to a new branch based on the head of trunk should be no
different than a merge to trunk itself. The secondary merge of the newly
merged branch to trunk will be trivial. I still often do exactly what
you propose so that I can test and debug the merged code before
committing it to trunk.
So
Hi Everyone,
I am having some issues with merging that I could use some advice on, please.
I have a trunk and a customer branch.
The decision has been made that all features belonging to the branch need to be
added back into the trunk.
Changes have also been ongoing in the trunk too.
Is there
