Sign In
michal.Log
Translate This Page
Translate this page
Powered by
Microsoft® Translator
Options
Blog Home
About
Email Blog Author
Share this
RSS for posts
Atom
RSS for comments
Search
Advanced search options...
Search In:
Everything
Blogs
Forums
People
Groups
Places
Pages
Date range:
All Time
Last Year
Last 6 Months
Last 3 Months
Last Month
Last Week
Last Two Days
Tags
General
Rosario
Team Foundation Server
TFS Msscci Provider
TFS2008
Archive
Archives
June 2010
(3)
April 2010
(3)
February 2010
(1)
January 2010
(1)
December 2009
(3)
June 2009
(4)
January 2009
(4)
May 2008
(1)
April 2008
(2)
January 2008
(5)
November 2007
(1)
May 2007
(1)
April 2007
(1)
February 2007
(1)
January 2007
(1)
December 2006
(3)
November 2006
(1)
September 2006
(1)
June 2006
(1)
April 2006
(1)
March 2006
(2)
February 2006
(4)
Resolve improvements in Dev10 – Automerge All part2
MSDN Blogs
>
michal.Log
>
Resolve improvements in Dev10 – Automerge All part2
Resolve improvements in Dev10 – Automerge All part2
michalma
10 Jan 2009 7:31 PM
Comments
1
TFS always creates conflict when rename is involved, even if it's only on server/source branch. We expanded Automerge All, so it can automatically resolve those conflicts. We exclude from this, conflicts on folders, as those are rare and user should review them.
If you can think of other ways of expanding "Automerge All", please let us know - sometimes a few hours of work invested in the tool can save days of work spent duirng big merges :)
1 Comments
Rosario
Blog - Comment List MSDN TechNet
Comments
Loading...
Leave a Comment
Name
Comment
Please add 6 and 8 and type the answer here:
Post