Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
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 :)
Comments
- Anonymous
January 10, 2009
PingBack from http://blog.a-foton.ru/index.php/2009/01/11/resolve-improvements-in-dev10-%e2%80%93-automerge-all-part2/