refine branch testing logic

require at least one patchset commit
add '--conflict' to allow conflicting cherry-picks
fix: don't modify cherrymap

Later checks need the original (assertion failure
happened).
wipe the index before checking out trees

Cruft from earlier patchsets was retained
without doing this.