in TFS can we customize the merge algorithm (conflict resolution)

Posted by Jennifer Zouak on Stack Overflow See other posts from Stack Overflow or by Jennifer Zouak
Published on 2010-02-22T19:25:49Z Indexed on 2010/04/02 3:43 UTC
Read the original article Hit count: 461

Filed under:

tfs

|

version-control

|

merge

|

source-code-management

|

code-generation

In our case we want to igonore changes in code comment headers for generated code. In Visual Studio, we can change the merge tool (GUI that pops up) and use a 3rd party tool that is able to be customized to ignore changes (http://msdn.microsoft.com/en-us/library/ms181446.aspx). Great, so a file comparison no longer highlights code comments as differences.

However when it comes time to checkin, the TFS merge algorith is still prompting us to resolve conflicts.

Is there any way to better inform the merge conflict resolution algorithm about which changes are actually important to us? Or can we replace the algorithm or otherwise have it subcontract its work to a 3rd party?

© Stack Overflow or respective owner

Related posts about tfs

TFS - Rebinding solution to new TFS when prior TFS no longer available

as seen on Stack Overflow - Search for 'Stack Overflow'
The prior instance of TFS I was using is no longer available and I have a test project I want to bind to the new instance of TFS. However, when I try to add the solution to source control, the error message tells me that the collection is not available on the server. I have deleted all old source… >>> More
TFS 2010 Basic Concepts

as seen on Geeks with Blogs - Search for 'Geeks with Blogs'
v\:* {behavior:url(#default#VML);} o\:* {behavior:url(#default#VML);} w\:* {behavior:url(#default#VML);} .shape {behavior:url(#default#VML);} Normal 0 false false false false EN-US X-NONE X-NONE … >>> More
TFS 2010, can I migrate source code only ?

as seen on Stack Overflow - Search for 'Stack Overflow'
Our old TFS 2008 installation is getting old, and we would like to migrate to TFS 2010. However, the structure of our team projects is not so well thought out, and there has been various experiments with process templates and editing of work items and so on. Therefore, I would like to migrate our… >>> More
Insufficient Permissions Problems with MSDeploy and TFS Build 2010

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
I ran into these problems on a TFS 2010 RC setup where I wanted to deploy a web site as part of the nightly build: C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.targets (3481): Web deployment task failed.(An error occurred when reading the IIS Configuration… >>> More
TFS 2008 Web Access Report 100 record limitation

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
By default TFS 2008 Web Access has the limit of 100 record when you open any query in report mode. Even if you tried to export the query to excel or PDF you will only get first 100 record exported. To overcome this issue, you have to reconfigure this count in the web.config file Navigate to… >>> More

Related posts about version-control

In the context of the TFS version control SDK (Microsoft.TeamFoundation.VersionControl), what exactl

as seen on Stack Overflow - Search for 'Stack Overflow'
In the context of the TFS version control SDK (Microsoft.TeamFoundation.VersionControl), what exactly is deletionID? It is a property of Microsoft.TeamFoundation.VersionControl.Client.Item. It is also a parameter to some of the query methods on Microsoft.TeamFoundation.VersionControl.Client. I'm… >>> More
What are the advantages of version control systems that version each file separately?

as seen on Programmers - Search for 'Programmers'
Over the past few years I have worked with several different version control systems. For me, one of the fundamental differences between them has been whether they version files individually (each file has its own separate version numbering and history) or the repository as a whole (a "commit" or… >>> More
What are the advantages of version control systems that version each file separately?

as seen on Programmers - Search for 'Programmers'
Over the past few years I have worked with several different version control systems. For me, one of the fundamental differences between them has been whether they version files individually (each file has its own separate version numbering and history) or the repository as a whole (a "commit" or… >>> More
R and version control for the solo data analyst

as seen on Stack Overflow - Search for 'Stack Overflow'
Many data analysts that I respect use version control. For example: http://github.com/hadley/ See comments on http://permut.wordpress.com/2010/04/21/revision-control-statistics-bleg/ However, I'm evaluating whether adopting a version control system such as git would be worthwhile. A brief overview: I'm… >>> More
What version control tool can generate this header

as seen on Stack Overflow - Search for 'Stack Overflow'
This is from a sql script. What tool can generate this? Thanks --USE [MY_TABLE] GO /****** Object: StoredProcedure [dbo].[adminIncExp] Script Date: 03/05/2010 09:14:12 ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO -- ============================================= -- Author: … >>> More