From: demerphq <demerphq@gmail.com>
To: Git <git@vger.kernel.org>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting
Date: Tue, 16 Nov 2010 11:38:44 +0100 [thread overview]
Message-ID: <AANLkTimAgDDkPowrfF2QNDdLaxHEyOPVgFy=5rafPWoj@mail.gmail.com> (raw)
In-Reply-To: <AANLkTinv7XsXNR2MMbaGAUo2=WgL6SEWkuzwGU_7YVn0@mail.gmail.com>
On 16 November 2010 11:26, demerphq <demerphq@gmail.com> wrote:
> The error in the subject line is generated if one has a git repo
> checked out to a commit that adds a new file and one does something
> like:
>
> git reset HEAD^
>
> and then a merge operation that involves going forward onto or past HEAD.
In fact there are more operations where this can happen. A
failed/aborted rebase. A failed/aborted merge. etc.
All of them, so far in my experience, resulting in this bogus error
about overwriting a file with itself.
cheers,
Yves
--
perl -Mre=debug -e "/just|another|perl|hacker/"
next prev parent reply other threads:[~2010-11-16 10:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 10:26 Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting demerphq
2010-11-16 10:38 ` demerphq [this message]
2010-11-16 11:24 ` Nguyen Thai Ngoc Duy
2010-11-16 11:34 ` Nguyen Thai Ngoc Duy
2010-11-17 8:37 ` demerphq
2010-11-17 9:22 ` Ævar Arnfjörð Bjarmason
2010-11-17 8:46 ` Matthieu Moy
2010-11-17 9:33 ` Nguyen Thai Ngoc Duy
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='AANLkTimAgDDkPowrfF2QNDdLaxHEyOPVgFy=5rafPWoj@mail.gmail.com' \
--to=demerphq@gmail.com \
--cc=avarab@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.
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 NNTP newsgroup(s).