[--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 branchmerge-tool— resolve conflicts with the merge tools you set up withdv merge-tool. See External Merge Tools.ai— resolve text conflicts with AI. Completes the merge only if AI resolves every conflict; otherwise the merge stays open for the app. Available on Professional plans and higher. See Resolve Conflicts with AI.
[--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.
