Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-19 Thread Phillip Wood
Hi Sebastián On 19/02/2019 14:03, Sebastián Mancilla wrote: My system is macOS Mojave 10.14.2. I normally use Git from Homebrew (currently Git 2.20.1). I investigated this further, and I think I found the problem on my end. When I actually run "git rebase --interactive " from the terminal, eve

Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-19 Thread Sebastián Mancilla
No, it's not a typo. I just checked again. That's the file that results when I start the rebase from tig (the Nix version), which results in the error for rebase --continue. When I start the rebase manually or from tig (the Homebrew version) it has the quote. GIT_AUTHOR_NAME='Sebastián M

Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-19 Thread Christian Couder
On Tue, Feb 19, 2019 at 3:03 PM Sebastián Mancilla wrote: > > My system is macOS Mojave 10.14.2. I normally use Git from Homebrew (currently > Git 2.20.1). > > I investigated this further, and I think I found the problem on my end. [...] > I also did bisect Git (I never though I would be bisecti

Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-19 Thread Duy Nguyen
On Tue, Feb 19, 2019 at 9:04 PM Sebastián Mancilla wrote: > And the content of .git/rebase-merge/author-script is always the same: > > GIT_AUTHOR_NAME='Sebastián Mancilla' > GIT_AUTHOR_EMAIL='smanc...@jlab.org' > GIT_AUTHOR_DATE='@1550530007 -0300 > Just to be clear, the l

Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-19 Thread Sebastián Mancilla
My system is macOS Mojave 10.14.2. I normally use Git from Homebrew (currently Git 2.20.1). I investigated this further, and I think I found the problem on my end. When I actually run "git rebase --interactive " from the terminal, everything works fine. But almost every time I start my rebases f

Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-19 Thread Phillip Wood
Dear Sebastián On 19/02/2019 07:22, Eric Sunshine wrote: [cc:+phillip.w...@talktalk.net] Thanks Eric On Tue, Feb 19, 2019 at 1:45 AM Christian Couder wrote: On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla wrote: But since Git 2.20.x it doesn't work anymore. Now after solving the confl

Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-18 Thread Eric Sunshine
[cc:+phillip.w...@talktalk.net] On Tue, Feb 19, 2019 at 1:45 AM Christian Couder wrote: > On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla > wrote: > > 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 m

Re: git rebase --continue after solving conflicts doesn't work anymore

2019-02-18 Thread Christian Couder
On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla wrote: > > I've always used "git rebase --continue" as the help shows: > > Resolve all conflicts manually, mark them as resolved with > "git add/rm ", then run "git rebase --continue". > > and Git would apply the conflicted commit without

git rebase --continue after solving conflicts doesn't work anymore

2019-02-18 Thread Sebastián Mancilla
I've always used "git rebase --continue" as the help shows: Resolve all conflicts manually, mark them as resolved with "git add/rm ", 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