Sounds like we need three flags
--local-wins-conflict --remote-wins-conflict --report-and-skip-conflicts (default)
--local-wins-conflict
--remote-wins-conflict
--report-and-skip-conflicts