[--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
[--nowait] returns immediately without waiting for the updated files to finish syncing to your local workspace. By default, the command waits until the sync is done.
