Remove an extra cache existence lookup that wasn't needed
Simplify a type
Fix problem with incorrect arg order to MergeConflicted
Rename oid to treeOid
Use "ghi comment" and "ghi label"
Pass -c merge.conflictstyle=merge when pulling
cliPullCommitDirectly now requires a user/email
Specifically set config.name and config.email