Inedo Community Forums Forums
    • Recent
    • Tags
    • Popular
    • Login

    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

    Scheduled Pinned Locked Moved Support
    source-controlbuildmastertfs
    2 Posts 1 Posters 3 Views
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • ? This user is from outside of this forum
      Guest
      last edited by

      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.

      1 Reply Last reply Reply Quote 0
      • ? This user is from outside of this forum
        Guest
        last edited by

        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.

        1 Reply Last reply Reply Quote 0

        Hello! It looks like you're interested in this conversation, but you don't have an account yet.

        Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.

        With your input, this post could be even better 💗

        Register Login
        • 1 / 1
        • First post
          Last post
        Inedo Website Home • Support Home • Code of Conduct • Forums Guide • Documentation