From: "Jelle Geerts" <jellegeerts@gmail.com>
To: git@vger.kernel.org
Subject: Automatic cherry-pick failure
Date: Sat, 12 Jul 2008 13:55:07 +0200 [thread overview]
Message-ID: <bf2cff050807120455p2394481bg181debddb86961dd@mail.gmail.com> (raw)
Hello,
When I tried to `git rebase -i', I changed the first line in the editor from
'pick' to 'edit'. After the editor exited, git complained:
error: Untracked working tree file 'DESIGN.TXT' would be overwritten by merge.
But this file is tracked, so first I did `git rebase --abort'.
I had to use `git config --bool core.ignorecase true' to get around the error.
It's because I use Git with Cygwin on an NTFS partition. Only thing I is that
'core.ignorecase' is undocumented.
After getting around the Cygwin specific workaround, I reran rebase. Again, I
edited the first line from 'pick' to 'edit'. All went well. Then I made the
amendment to the commit with `git commit --amend --author="me <me@somewhere>"'.
Now, when I typed `git rebase --continue' I got this:
error: Entry 'code/src/sys_main.cc' not uptodate. Cannot merge.
fatal: merging of trees e3249e935c9ccd790c372aac82b8e097044b1ffe and
ac79e613ed0fe912e0da2c5ccf52f6a540533cb8 failed
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>', and
run 'git rebase --continue'
Could not apply 5c03af9... commit test
I'm not sure what I have to do now, can someone help me with this?
-- Jelle
reply other threads:[~2008-07-12 11:56 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=bf2cff050807120455p2394481bg181debddb86961dd@mail.gmail.com \
--to=jellegeerts@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).