message no. 49414
Posted by Trindaz_ in #github at 2014-09-24T22:52:53Z
An error that happens semi-regularly: `git rebase master` creates merge conflicts. I resolve the conflicts. Then do `git rebase --continue` and I get "No changes - did you forget to use 'git add'?"