locked
Could tfs merge based on simple file difference? RRS feed

  • Question

  • Could I merge branches in the TFS based on simple file difference? 
    For example, 
    1) I create a DEV branch from the MAIN branch 
    2) Modify some code in the MAIN branch 
    And I want to merge MAIN branch with the DEV code. 
    Basically, TFS wouldn`t allow me this kind of merge cause it would suppose that there were no pending changes in th DEV though the files will be definitely different. Can I do it with some console commands or some wise UI manipulations? Could I control this kind of merge?
    Tuesday, January 15, 2013 9:29 AM

Answers

  • If you want changes from MAIN to DEV branch, you should do a "Get Latest". When done With changes in the DEV branch, you should test and verify before MERGING Your changes back to the MAIN branch.

    See the good branching and merging guide from the TFS team.

    http://vsarbranchingguide.codeplex.com/


    Roar Jørstad aka sveroa
    Senior Consultant, EVRY as
    Blog: Notebook, trick & tips
    Please mark as answer or helpful if my post is useful


    Tuesday, January 15, 2013 2:09 PM