v1.4.0

Better handling of merge conflicts
When a cherrypick resultet in a conflict, the user should manually fix it. Unfortunately the user was not made aware, that she should also commit her changes. This sometimes resulted in pull request that didn't have the changes for the conflict resolution.

With this patch the user cannot proceed to from the cherrypick step, if a conflict occurred, and has not been completely resolved. If the index is dirty (new or modified files), and the user still tries to continue, a new prompt will ask her to resolve and commit it.