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

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

BIT Version

  hi,     knows how find out ther bit version in sql  , windows os (32 or 64)   regards, s.balavenkatesh   microsoft sql server 2005 - 9.00.1399.06 (intel x86) oct 14 2005 00:33:37 copyright (c) 1988-2005 microsoft corporation standard edition on windows nt 5.2 (build 3790: service pack 2)     intel x86)   -- says sql server 32 bit   madhu SQL Server  >  SQL Server Tools
Read more

Admin Permissions

hi need create new 'role' following permissions, 1. access sql server logs. 2. access maintenance plans ( can avoid access) 3. access activity monitor 4. normal access product databases , not system db´s need guidance on how it, can point me in right direction please? thanks 1.grant  execute on xp_readerrorlog [domainname\ad user or group]; 2. http://technet.microsoft.com/en-us/library/ms191002.aspx 3.view server state permission 4. make user member of dbo_owner database role. best regards,uri dimant sql server mvp, http://sqlblog.com/blogs/uri_dimant/ ms sql optimization: ms sql development , optimization ms sql consulting: large scale of database , data cleansing remote dba services: improves ms sql database performance sql server integration services: business intelligence SQL Server  >  ...
Read more