Welcome to the Inedo Forums! Check out the Forums Guide for help getting started.
If you are experiencing any issues with the forum software, please visit the Contact Form on our website and let us know!
How do I get Buildmaster to Merge in TFS
-
I see the Buildmaster Action to Branch Sourcecontrol, but how do I get it to Merge?
We want to get the code from our dev branch for continuous integration. We want to add a label to source control each time we get an integration build.
When Integration testing is complete, we want to get the code from the Dev branch as of the last label from buildmaster and Merge that code into the Production branch. I cannot see the Action to Merge branches.
-
The Branch Action is designed for "tagging" builds (Subversion and CVS), and actually, it's been renamed in 3.2 and will only be displayed if you have one of those providers.
You're definitely on the right track for labeling each build, but merging... it's not really something you can do on an automated basis because of conflicts.
That said, if you do want to merge, you can simply call tf.exe merge.