* Confused situation after a merge
@ 2011-04-12 13:29 Patrick Doyle
0 siblings, 0 replies; only message in thread
From: Patrick Doyle @ 2011-04-12 13:29 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-12 13:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-12 13:29 Confused situation after a merge Patrick Doyle
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).