D 2010-05-23T19:47:41
J +comment \n\n<hr><i>anonymous\sadded\son\s2010-05-23\s19:47:41:</i><br>\nThat's\sso\scool!\sIt\sdefinitely\sneeds\sexplaining\sand\sshowing\soff!\r\n\r\nI\sexpected\sAlice\sto\shave\sto\snotice\sthat\sa\sfork\shad\shappened,\ssomehow,\sthen\scopy\sher\slocal\sTest.txt\selsewhere\sso\sit\sdidn't\sget\soverwritten,\sthen\spull,\sthen\suse\ssome\sdiff\sapp\slike\skdiff3\sto\scompare\sthe\stwo\sversions...\r\n\r\nbut\sall\sthat\shappens\sis\sthat\sfossil\sadds\sMERGE\sCONFLICT\sto\sthe\sfile\sin\sthe\sproblem\sareas,\sso\sshe\scan\ssearch\sfor\sthose\sand\sedit\sin\sjust\sthe\sone\sfile.\r\n\r\nChecked-in\sbinaries\sare,\sI\sguess,\sa\swhole\sdifferent\sproblem?\r\n\r\nI\sneed\sto\stry\sit\sagain\sto\smake\ssure\sI've\sgot\sit:\sI\smerged\sbefore\spulling,\swhich\smay\shave\smade\sit\sso\sAlice\sdidn't\sneed\sto\srealise\sthere\swas\sa\sfork...\r\n\r\n
K 58339f7b10de7c67e09ef41ba9d90c7dc4c972f1
U anonymous
Z e71ca303095c4ac6e330df5f26a2c1eb