Sign in
 
Team System Developer Center > Visual Studio Team System Forums > Team Foundation Server - General > Merging deleted files
Ask a questionAsk a question
Search Forums:
 

General DiscussionMerging deleted files

  • Wednesday, October 28, 2009 12:07 PMRaquel Lamas Users MedalsUsers MedalsUsers MedalsUsers MedalsUsers Medals
     
    Sign In to Vote
    0
    Sign In to Vote
    Hi!

    I deleted some files from a specific branch and when a try to merge this files with the main trunk, this files weren´t deleted in main trunk after merge operation.

    Anybody knows what happens?

    Tks a lot.

    Raquel
     

All Replies

  • Wednesday, October 28, 2009 2:05 PMJehan33 Users MedalsUsers MedalsUsers MedalsUsers MedalsUsers Medals
     
    Sign In to Vote
    0
    Sign In to Vote
    Hi Raquel,

    During merge did you got any conflicts? This issue happens due to merge conflict.

     
  • Wednesday, October 28, 2009 6:00 PMRaquel Lamas Users MedalsUsers MedalsUsers MedalsUsers MedalsUsers Medals
     
    Sign In to Vote
    0
    Sign In to Vote
    No. VSTS finished merge operation sucessfully and didn´t return any conflict or error message. 

    The deleted folders (branch) remains on main trunk after merge. Very Strange!!!!

    Tks Jehan.