[--conflict_resolution <strategy>] sets how conflicts are handled:
manual— resolve conflicts manually (default)keep-current— keep the workspace’s changesaccept-incoming— accept the latest changes from the checked-out branch
Sync and refresh your workspace with the Diversion update command to stay aligned with repository changes.
[--conflict_resolution <strategy>] sets how conflicts are handled:
manual — resolve conflicts manually (default)keep-current — keep the workspace’s changesaccept-incoming — accept the latest changes from the checked-out branch