Can we specify that certain file types should not be auto merged?


i want specify files types should not auto merged, we have many (700+) vb6 projects each branched various versions of application in different stages of development.

quite bit of merging takes place between these version branches, merging isnt problem, except vb6 project files.

there 2 problems why want manual merge them. 

1. the format of project files subject heavy change if minor changes made adding new file.

2. changes new version number of versions of references in files not seen conflicting , merged automaticaly in many cases wrong thing do.

 

problem 1 makes hard merge adding of file target project file because files dont match @ all, not of problem can use our own merge tool update these nicely. (as these seen conflicting)

 

problem 2 harder because doesnt give chance use our merge tool because tfs thinks can update changes safely.

 

i want tell tfs never auto merge vb6 project file can use our own merge tooling merge type of file. in effect show conflicting.

 

incase anyone suggests: not option disable filemerging filetype want able use multiple check out , able reconcile differences.

 

any highly appreciated!

i think confusing terminology here.  there 2 operations called "merge":

"tree merge" - when run tf merge integrate 1 branch another.  server calculates files have changed in source & target , pends appropriate changes & conflicts.

"content merge" - in process of resolving conflicts, diff/merge tool can used on each file weave modified lines of code

what wrote above concerned "content merge."  contrast, there no way change behavior of "tree merge" @ all.  when server determines it's safe overwrite file in target branch, doesn't @ file type or file contents.  it's done purely based on history of previous checkins & merges.


Archived Forums V  >  Team Foundation Server - Source and Version Control



Comments

Post a Comment

Popular posts from this blog

Conditional formatting a graph vertical axis in SSRS 2012 charts

Image
hi, i have situation want color label on vertical axis of graph depending on condition. when values positive color black , when negative color red. i tried following condition but not working.   =iif(fields!myfield.value < 0 , "red", "black") i know there few threads mentioning feature not supported in ssrs 2008 wanted know if adddressed in ssrs 2012 or later? thanks , regards, oliver d'mello hi oliver, according description, want use expression specify different color axis labels based on values in chart. as tested in our environment, when apply condition in expression give dynamic color axis labels, color setting applies labels based on condition. issue happens in both sql server 2012 , 2014. please refer screenshots below: in scenario, recommend submit issue microsoft connect @ link https://connect.microsoft.com/sqlserver/feedback . connect site serve connecting point between , microsoft, , large community , microsoft intera
Read more

Register with Power BI failed

hi all, i've running local report server , want configure power bi integration. sign in azure active directory , registering power bi clientapp validated, fails following error: microsoft.reportingservices.wmiprovider.wmiproviderexception: unknown error has occurred in wmi provider. error code 80131500  ---> system.exception: exception of type 'system.exception' thrown.    --- end of inner exception stack trace ---    at microsoft.reportingservices.wmiprovider.rswmiadmin.throwonerror(managementbaseobject mo)    at microsoft.reportingservices.wmiprovider.rswmiadmin.savepowerbiinformation(string clientid, string clientsecret, string appobjectid, string tenantname, string tenantid, string resourceurl, string authurl, string tokenurl, string redirecturls)    at reportservicesconfigui.wmiprovider.rsreportserveradmin.savepowerbiinformation(powerbiappconfiguration appconfig) i tried sql server agent solution  ( https://social.msdn.microsoft.com/forums/en-us/58
Read more

SQL server replication error Cannot find the dbo or user defined function........

hi there, i ran problem while deploying sql 2008 transactional replication between 2 servers lets assume server , b. actually created  both distributor , publisher on server , after created subscriber pointed server b, launch replication monitor , found big red cross. when click on tab "distributor subscriber history" error says "cannot find either column "dbo" or user defined-function or aggregate "dbo.ufnleadingzeros", or name ambiguous". can body regarding issue. regards, ishuv hi, you need compare data , others reseved, index size, unused should not compared. differs. here server - data - 87896 kb server b - data - 78152 kb server data size includes publication tables, can't compare directly. need check article article know exact data size. SQL Server  > 
Read more