Automatically merge branches

[Busboy]

Is it possible to merge branches automatically? We are playing with the idea of having our build script merging changes from branch back into baseline before build, to ensure all bug-fixes are available in baseline also. I know that resource-files and dialog files can’t be automatically merged, but standard bug-fixes in source-files should be possible to automate back to baseline each night. Having this option through a command line API would be great.

Kim

[lbauer]

This isn't available in the Command Line Client. Even the Merge Branches Wizard in the GUI client takes some human intervention to manage conflicts, etc.

But I'll log it as a feature request to consider for the future.