From: "Yann Dirson" <ydirson@altern.org>
To: git@vger.kernel.org
Subject: [UI issue + BUG] recovering from rebase aborting due to untracked files
Date: Fri, 15 Jan 2010 11:44:22 +0100 [thread overview]
Message-ID: <ea70c5e3e02a9e9a39384ea417bfa59a.squirrel@intranet.linagora.com> (raw)
During an interactive rebase, it happened that some testing operations on
one commit created files that were normally added by a later commit,
leading to the following conflict:
$ git rebase --continue
error: Untracked working tree file 'xxxx' would be overwritten by merge.
Aborting
Could not apply 8a2ea0a... L10n of photo and games.
$
No clue is given about what to do next. It would be nice if one could
just removes the faulty files, and use "rebase --continue".
Unfortunately, doing the following results in the rebase being prematurely
finished with success, with all patches starting with the one causing the
problem being silently dropped.
Now it is not so hard for an experienced user to rewind and avoid doing
the mistake a second time, but some safeguards would be nice.
Does anyone with knowledge of rebase internals see what goes wrong and how
to fix it best ?
reply other threads:[~2010-01-15 10:54 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea70c5e3e02a9e9a39384ea417bfa59a.squirrel@intranet.linagora.com \
--to=ydirson@altern.org \
--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