When Renames Are Part of the Merge, Pay Close Attention to the Path That the Tool Recommends

- J.D. Meier, Jason Taylor, Alex Mackman, Prashant Bansode

When renames are part of the merge, pay close attention to the path that the tool recommends and make changes as appropriate. All renames are marked as conflicts. The merge algorithm used by TFS tries to calculate the best target path when a rename is being merged over. In some cases the default target path is not the desired path, so you should always double-check prior to committing the merged file.

Additional Resources

Last edited Jul 26, 2007 at 9:24 AM by prashantbansode, version 3

Comments

No comments yet.