http://blogs.msdn.com/vstsue/pages/504417.aspxMerging is the process of combining the changes in two distinct branches. A merge operation takes changes that have occurred in the source branch and integrates them into the target branch. Merging integrates all types of changes in the source branchen-USCommunityServer 2.1 SP1 (Build: 61025.2)http://blogs.msdn.com/vstsue/pages/504417.aspx#506541Thu, 22 Dec 2005 02:15:36 GMT91d46819-8472-40ad-a661-2c78acb4018c:506541James DawsonHi, <br> <br>I've only just come across your post, and it relates directly to an issue I am currently experiencing when using branch/merge - specifically, changes are getting lost after a merge operation that doesn't trigger any conflict resolution, when it needs to. <br> <br>I have outlined the scenario here: <br> <br><a rel="nofollow" target="_new" href="http://blogs.conchango.com/jamesdawson/archive/2005/12/20/2518.aspx">http://blogs.conchango.com/jamesdawson/archive/2005/12/20/2518.aspx</a> <br> <br>I would appreciate your thoughts. <br> <br>Many Thanks. <br>http://blogs.msdn.com/vstsue/pages/504417.aspx#762800Wed, 20 Sep 2006 02:22:46 GMT91d46819-8472-40ad-a661-2c78acb4018c:762800James Dawson's BlogSo after receiving an e-mail from someone asking whether I&amp;amp;#39;d heard anything more regarding the TFS