All of lore.kernel.org
 help / color / mirror / Atom feed
From: Clemens Buchacher <drizzd@aon.at>
To: Hannu Koivisto <azure@iki.fi>
Cc: git@vger.kernel.org
Subject: Re: "Your local changes ... would be overwritten" bug
Date: Tue, 6 Sep 2011 09:34:36 +0200	[thread overview]
Message-ID: <20110906073436.GA28490@ecki> (raw)
In-Reply-To: <8362l73qi6.fsf@kalahari.s2.org>

Hi,

On Mon, Sep 05, 2011 at 07:25:53PM +0300, Hannu Koivisto wrote:
> 
> I have a problem where "git checkout origin/another-branch" in master
> should remove a set of files but instead I get:
> 
> error: Your local changes to the following files would be overwritten by checkout:
>         file1
>         file2
>         ...
> Please, commit your changes or stash them before you can switch branches.
> Aborting

Could you set a breakpoint in add_rejected_path and send us the
backtrace? Like this:

$ gdb --args git checkout origin/another-branch
>> break add_rejected_path
>> r
... wait for break ...
>> bt

Thanks,
Clemens

  parent reply	other threads:[~2011-09-06  7:37 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-05 16:25 "Your local changes ... would be overwritten" bug Hannu Koivisto
2011-09-05 16:52 ` Matthieu Moy
2011-09-05 18:31   ` Vijay Lakshminarayanan
2011-09-05 23:37     ` Andrew Ardill
2011-09-06  7:34 ` Clemens Buchacher [this message]
2011-09-06  9:46   ` Hannu Koivisto

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=20110906073436.GA28490@ecki \
    --to=drizzd@aon.at \
    --cc=azure@iki.fi \
    --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. 
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.