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

'Sebastián Mancilla' GIT_AUTHOR_EMAIL='smanc...@jlab.org' GIT_AUTHOR_DATE='@1550530007 -0300' Regards El mar., 19 de feb. de 2019 a la(s) 11:15, Duy Nguyen (pclo...@gmail.com) escribió: > > On Tue, Feb 19, 2019 at 9:04 PM Sebastián Mancilla >

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

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

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

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