add on conflict options for standalone activities#764

fretz12 merged 4 commits into

mastertemporalio/api:masterfrom

fredtzeng/saa-on-conflicttemporalio/api:fredtzeng/saa-on-conflictCopy head branch name to clipboard