Confused situation after a merge

Hello folks, I'm trying to sort out a confused working copy. I'm not sure how things got into this state (I'm still waiting for a phone call from the person who got things into this state), but I have a working copy whose "git status" looks like this:

# On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: oalib/cmos7rf_sc/tiehi/constraint/hierDesign.oa # new file: oalib/cmos7rf_sc/tiehi/constraint/master.tag # new file: oalib/cmos7rf_sc/tiehi/constraint/prop.cfg # modified: oalib/cmos7rf_sc/tiehi/layout/layout.oa # new file: oalib/cmos7rf_sc/tiehi/schematicz/data.dm # new file: oalib/cmos7rf_sc/tiehi/schematicz/master.tag # new file: oalib/cmos7rf_sc/tiehi/schematicz/sch.oa # modified: oalib/cmos7rf_sc/tiehi/symbol/symbol.oa # copied: oalib/cmos7rf_sc/tiehi/layout/layout.oa -> oalib/cmos7rf_sc/tielow/layout/layout.oa # new file: oalib/cmos7rf_sc/tielow/schematicz/data.dm # new file: oalib/cmos7rf_sc/tielow/schematicz/master.tag # new file: oalib/cmos7rf_sc/tielow/schematicz/sch.oa # modified: oalib/cmos7rf_sc/tielow/symbol/symbol.oa # # Changes not staged for commit: ... # deleted: oalib/cmos7rf_sc/tiehi/constraint/hierDesign.oa # deleted: oalib/cmos7rf_sc/tiehi/constraint/master.tag # deleted: oalib/cmos7rf_sc/tiehi/constraint/prop.cfg # modified: oalib/cmos7rf_sc/tiehi/layout/layout.oa # modified: oalib/cmos7rf_sc/tiehi/schematic/data.dm # modified: oalib/cmos7rf_sc/tiehi/schematic/sch.oa # deleted: oalib/cmos7rf_sc/tiehi/schematicz/data.dm # deleted: oalib/cmos7rf_sc/tiehi/schematicz/master.tag # deleted: oalib/cmos7rf_sc/tiehi/schematicz/sch.oa # modified: oalib/cmos7rf_sc/tielow/layout/layout.oa # modified: oalib/cmos7rf_sc/tielow/schematic/data.dm # modified: oalib/cmos7rf_sc/tielow/schematic/sch.oa # deleted: oalib/cmos7rf_sc/tielow/schematicz/data.dm # deleted: oalib/cmos7rf_sc/tielow/schematicz/master.tag # deleted: oalib/cmos7rf_sc/tielow/schematicz/sch.oa

That is, the index contains a bunch of files listed as new files, while the working copy lists those same files as "deleted".

Not having been there when he did this, I don't know exactly what happened, but I suspect that he tried to do a "git pull" which resulted in some conflicts (with our mostly binary repository) and that things went south from there.

Looking in .git, I see a 41 byte ORIG_HEAD from 10:49 yesterday morning, and a 169 byte FETCH_HEAD from 19:51 last night (as well as an updated index from 19:51) last night.

I guess I'm looking for some tips on how to do some forensic analysis to understand what was done, as well as some tips on where to go from here. You folks are always so helpful when I ask questions such as this on this list. Thanks again.

--wpd