Merge pull request #5 from alexouzounis/RevertRebase

make sure we check for conflicted_unresolved as well as conflicted when
bump up version
Enhance rebase failure log message
Enhance rebase failure log message
Merge branch 'alexouzounis-enhanceRebaseLogging'