Conflicts improvements

This pull request add support for conflict solving to the cherry pick and rebase operations, which currently didn't have it.

Also, it extends the features of conflict-solving for the merge command, improving the automerge functionality.