TFS Merge of Branch Results in Code Corruption


we have 2 branches, main , dev branch.  merged main dev.  we've done few times, , have had problems files not having correct content.  i.e. image.cs should contain small class called image, contains assemblyinfo.cs file.  little frustrating, tried careful , catch before went wrong.

however, our last merge left dozens of corrupt files, including numerous interface files (usually less 2kb) new sizes in mb range.

we're running tfs 2008 on windows 2008 server visual studio 2008 team system team suite clients.

has seen behavior before?  we're lucky happened on our dev branch, not our main branch, nonetheless, have lost lot of work.

thanks

wow.  mess.  looks being caused out kaspersky anti virus software.  large numbers of files being brought down server, virus check hosing delivery of files.  if brought them down 1 @ time, fine.  wasn't seeing problem because had somehow missed deployment of kaspersky on machine.  else had issue.

also, our site had begun cause bsod's on various machines.  yes, that's right, our web site causing of our dev machines blue screen of death.  once turned kaspersky off, bsod's stopped.  that's why personal machine wasn't having problem.

what huge waste of time.



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