Reputation: 58
I have been investigating any potential issues encountered when merging branches in TFS 2010.
All combinations which I have tried have worked perfectly, apart from one, and I am hoping that someone can help me understand why it is not working and/or what I am doing incorrectly.
It is perfectly reproducible, and I have described how below.
The problem scenario
The environment:
The scenario:
The outcome:
The correct scenario
Interestingly, the behaviour is different if the scenario is inversed, see below.
The outcome:
Conclusion
As far as I can see, the only solution is to avoid renaming files and to fix the issue manually after a merge, something I am hesitant to do if there is an automated way I can do this.
Upvotes: 1
Views: 1577
Reputation: 2548
Let me a bit extend your scenario.
MyClass.cs is edited in Branch A and renamed to MyClassRenamed.cs.
MyClass.cs is edited with a conflicting change in Branch B, but retains its name.
One of these Branches had to be merged into Integration branch (let's say Branch A)
At this moment of time, team working on Branch B decided to merge changes into Integration branch. As a good practice, before merging into Integration, they should pull down the changes from Integration and merge into branch B. Only after they do that and fix conflicts, they would merge branch B into Integration.
Next time Branch A to be merge, they should also follow good practice.
The above practice should resolve the issue of file names being different in the different Branches.
Upvotes: 1