From: "Sebastián Mancilla" <smancill.m@gmail.com>
To: git@vger.kernel.org
Subject: git rebase --continue after solving conflicts doesn't work anymore
Date: Tue, 19 Feb 2019 01:17:59 -0300 [thread overview]
Message-ID: <CAJPSwc1GuifK9BdssWQsf+oVY0Aw+PLM1pgAiis7UdV1tZrpew@mail.gmail.com> (raw)
I've always used "git rebase --continue" as the help shows:
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
and Git would apply the conflicted commit without issues and the rebase would
continue.
But since Git 2.20.x it doesn't work anymore. Now after solving the conflicts
and running "git rebase --continue" I get this error most of the time:
error: unable to dequote value of 'GIT_AUTHOR_DATE'
error: you have staged changes in your working tree
If these changes are meant to be squashed into the previous commit, run:
git commit --amend
If they are meant to go into a new commit, run:
git commit
In both cases, once you're done, continue with:
git rebase --continue
error: could not commit staged changes.
Now I have to run "git commit" first to commit manually and then do the "git
rebase --continue".
I've compiled 2.18.2 and 2.19.2 to check and the error doesn't happen.
It is present in 2.20.x and current master v2.21.0-rc1-9-gca1b411648.
Is it a regression because of the new rebase written in C?
--
Sebastian Mancilla
next reply other threads:[~2019-02-19 4:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 4:17 Sebastián Mancilla [this message]
2019-02-19 6:45 ` git rebase --continue after solving conflicts doesn't work anymore Christian Couder
2019-02-19 7:22 ` Eric Sunshine
2019-02-19 9:59 ` Phillip Wood
2019-02-19 14:03 ` Sebastián Mancilla
2019-02-19 14:14 ` Duy Nguyen
2019-02-19 14:25 ` Sebastián Mancilla
2019-02-19 14:18 ` Christian Couder
2019-02-19 14:32 ` Phillip Wood
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJPSwc1GuifK9BdssWQsf+oVY0Aw+PLM1pgAiis7UdV1tZrpew@mail.gmail.com \
--to=smancill.m@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).