We get this error when we try to merge with the development branch (Dev) back to our parent branch (Main). Main really had a few changes, postponed a few weeks ago, which included the deletion of some folders that exist in Dev. We believe this is the source of the problem. What is the best way to solve this problem.
Main should pretty much match Dev, but currently it lacks some subfolders. How can I make these folders / files go from Dev to Main? We try to manually resolve the changes, but this is a bit of a mess. It is hard to believe that TFS makes it difficult to solve this problem.
source share