TFS 2008 manual merge tool

Question

TFS 2008 provides a visual merge tool for manually resolving conflicts but

I can't find any documentation on that tool.  Can you please point to documentation or tutorial for that tool.

Answer 1

Hi Apadgett59, 

Thanks for your post. 

For how to resolve Conflicts between tow files using merge tool, please refer to this document: http://msdn.microsoft.com/en-us/library/ms181433(VS.90).aspx.

To understanding file differences and conflicts types, please refer to this document: http://msdn.microsoft.com/en-us/library/ms181434(VS.90).aspx.    

---

John Qiao [MSFT]
MSDN Community Support | Feedback to us

Answer 2

Hi Apadgett59, 

If misunderstood anything, please describe your question in more detail and we will be able to provide the better responses.

---

John Qiao [MSFT]
MSDN Community Support | Feedback to us