All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Powell <jpowell@vmware.com>
To: git@vger.kernel.org
Subject: submodule/index/working tree woes
Date: Fri, 24 Jun 2011 11:25:46 -0700	[thread overview]
Message-ID: <20110624182546.GB30640@vmware.com> (raw)

I have no changes to be committed (tracked or untracked according to
'git status') and yet when I try and switch branches git complains
that I have untracked working tree files that would be overridden
and aborts before the switch. 

The change I have just committed locally removes some files from the
repository and adds a submodule in it's place to better organize the
source for the project. 

Shaka, when the walls fell.  Anyone want to assist me with this issue?
Feeling clueless.

             reply	other threads:[~2011-06-24 18:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-24 18:25 John Powell [this message]
     [not found] ` <BANLkTik6xij0ZNy9nB2sbiF97Z4EF76sHQ@mail.gmail.com>
2011-06-25 11:02   ` submodule/index/working tree woes Alexei Sholik

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110624182546.GB30640@vmware.com \
    --to=jpowell@vmware.com \
    --cc=git@vger.kernel.org \
    --cc=masterblaster@vmware.com \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.