latest 2 messages by Trindaz_
+
[2014-09-24T22:53:00Z]
Trindaz_
what's going on?
+
[2014-09-24T22:52:53Z]
Trindaz_
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'?"