Gerrit 2.16 supports cherry picking commits even with merge conflicts, even tells you the files with conflicts with a comment). Lets create a plugin that uses the new field in the cherrypick rest api.

This should benefit mobile users/tablet users.