From: Patrick Doyle <wpdster@gmail.com>
To: git <git@vger.kernel.org>
Subject: Confused situation after a merge
Date: Tue, 12 Apr 2011 09:29:00 -0400 [thread overview]
Message-ID: <BANLkTi=hkXjSRzB4H11c7YDw6OXDqLTnjw@mail.gmail.com> (raw)
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
reply other threads:[~2011-04-12 13:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTi=hkXjSRzB4H11c7YDw6OXDqLTnjw@mail.gmail.com' \
--to=wpdster@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).