{"thread":{"id":"27070","subject":"Confused situation after a merge","startedAt":"2011-04-12T13:29:00Z","lastAt":"2011-04-12T13:29:00Z","messageCount":1,"participants":["Patrick Doyle"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"165685","messageId":"BANLkTi=hkXjSRzB4H11c7YDw6OXDqLTnjw@mail.gmail.com","threadId":"27070","inReplyTo":null,"subject":"Confused situation after a merge","fromName":"Patrick Doyle","fromEmail":"wpdster@gmail.com","sentAt":"2011-04-12T13:29:00Z","receivedAt":"2011-04-12T13:29:00Z","isPatch":false,"sender":{"key":"wpdster@gmail.com","avatar":null},"body":"Hello folks,\nI'm trying to sort out a confused working copy.  I'm not sure how\nthings got into this state (I'm still waiting for a phone call from\nthe person who got things into this state), but I have a working copy\nwhose \"git status\" looks like this:\n\n# On branch master\n# Changes to be committed:\n#   (use \"git reset HEAD <file>...\" to unstage)\n#\n#\tnew file:   oalib/cmos7rf_sc/tiehi/constraint/hierDesign.oa\n#\tnew file:   oalib/cmos7rf_sc/tiehi/constraint/master.tag\n#\tnew file:   oalib/cmos7rf_sc/tiehi/constraint/prop.cfg\n#\tmodified:   oalib/cmos7rf_sc/tiehi/layout/layout.oa\n#\tnew file:   oalib/cmos7rf_sc/tiehi/schematicz/data.dm\n#\tnew file:   oalib/cmos7rf_sc/tiehi/schematicz/master.tag\n#\tnew file:   oalib/cmos7rf_sc/tiehi/schematicz/sch.oa\n#\tmodified:   oalib/cmos7rf_sc/tiehi/symbol/symbol.oa\n#\tcopied:     oalib/cmos7rf_sc/tiehi/layout/layout.oa ->\noalib/cmos7rf_sc/tielow/layout/layout.oa\n#\tnew file:   oalib/cmos7rf_sc/tielow/schematicz/data.dm\n#\tnew file:   oalib/cmos7rf_sc/tielow/schematicz/master.tag\n#\tnew file:   oalib/cmos7rf_sc/tielow/schematicz/sch.oa\n#\tmodified:   oalib/cmos7rf_sc/tielow/symbol/symbol.oa\n#\n# Changes not staged for commit:\n...\n#\tdeleted:    oalib/cmos7rf_sc/tiehi/constraint/hierDesign.oa\n#\tdeleted:    oalib/cmos7rf_sc/tiehi/constraint/master.tag\n#\tdeleted:    oalib/cmos7rf_sc/tiehi/constraint/prop.cfg\n#\tmodified:   oalib/cmos7rf_sc/tiehi/layout/layout.oa\n#\tmodified:   oalib/cmos7rf_sc/tiehi/schematic/data.dm\n#\tmodified:   oalib/cmos7rf_sc/tiehi/schematic/sch.oa\n#\tdeleted:    oalib/cmos7rf_sc/tiehi/schematicz/data.dm\n#\tdeleted:    oalib/cmos7rf_sc/tiehi/schematicz/master.tag\n#\tdeleted:    oalib/cmos7rf_sc/tiehi/schematicz/sch.oa\n#\tmodified:   oalib/cmos7rf_sc/tielow/layout/layout.oa\n#\tmodified:   oalib/cmos7rf_sc/tielow/schematic/data.dm\n#\tmodified:   oalib/cmos7rf_sc/tielow/schematic/sch.oa\n#\tdeleted:    oalib/cmos7rf_sc/tielow/schematicz/data.dm\n#\tdeleted:    oalib/cmos7rf_sc/tielow/schematicz/master.tag\n#\tdeleted:    oalib/cmos7rf_sc/tielow/schematicz/sch.oa\n\nThat is, the index contains a bunch of files listed as new files,\nwhile the working copy lists those same files as \"deleted\".\n\nNot having been there when he did this, I don't know exactly what\nhappened, but I suspect that he tried to do a \"git pull\" which\nresulted in some conflicts (with our mostly binary repository) and\nthat things went south from there.\n\nLooking in .git, I see a 41 byte ORIG_HEAD from 10:49 yesterday\nmorning, and a 169 byte FETCH_HEAD from 19:51 last night (as well as\nan updated index from 19:51) last night.\n\nI guess I'm looking for some tips on how to do some forensic analysis\nto understand what was done, as well as some tips on where to go from\nhere.  You folks are always so helpful when I ask questions such as\nthis on this list.  Thanks again.\n\n--wpd\n"}]}