From: Ilya Kantor <iliakan@gmail.com>
To: git@vger.kernel.org
Subject: cherry-pick --no-commit does not work well with --continue in case of conflicts
Date: Sat, 5 May 2018 23:26:45 +0300 [thread overview]
Message-ID: <CAFU8umjvEATZguGDmcRMcfAkqn4LW7vf_B9qpLD7uc-E_7qR9g@mail.gmail.com> (raw)
Somewhy cherry-pick --no-commit does not work well with --continue.
Let's say I'm copying changes w/o committing and get a conflict:
> git cherry-pick -n master..feature
error: could not apply 2c11f12... Run work
Then I fix the conflict, but cherry-pick refuses to go on:
> git add .
> git cherry-pick --continue
error: your local changes would be overwritten by cherry-pick.
fatal: cherry-pick failed
It could continue *if* I committed, but I'm --no-commit for a reason,
so I shouldn't have to commit to go on with cherry-pick.
Maybe there's a preliminary check that prevents --continue and should be fixed?
---
Best Regards,
Ilya Kantor
next reply other threads:[~2018-05-05 20:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-05 20:26 Ilya Kantor [this message]
2018-05-06 2:53 ` cherry-pick --no-commit does not work well with --continue in case of conflicts Junio C Hamano
2018-05-06 5:17 ` Ilya Kantor
2018-05-08 5:53 ` Junio C Hamano
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=CAFU8umjvEATZguGDmcRMcfAkqn4LW7vf_B9qpLD7uc-E_7qR9g@mail.gmail.com \
--to=iliakan@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).