Description
The --accept optargs should match the interactive conflict resolution prompt, and we should keep these in sync over time. Any command that would prompt about conflicts should take this option, not only 'resolved'.
Original issue reported by epg