Best Practices & Guidelines to use TFS CONTINUED...

Branching & merging.

Guidelines continued:

Branching & Merging start.

13. No more than 2 active branches within Release/Iterations.
14. Main always leads towards future release.
15. No Development builds for QA automation, staging, UAT & Production.
16. Always map branch to local folder, do not map Project root or sub-folder inside a branch.
17. Merge always branches, not single file or folder.
18. In forward Merge, Select all changeset.

And the last one which is most important, which should be followed to accomplish all above points:

19. No consolidate check-ins.That's all folks. I hope you like it.
    Plz let me know, if u have any questions & doubts.
    Share your experience & problems.

CodeProject