diff --git a/cli/sync.ts b/cli/sync.ts index 926a856314..fcf3bca2cb 100644 --- a/cli/sync.ts +++ b/cli/sync.ts @@ -904,8 +904,15 @@ const command = new Command() "--fail-conflicts", "Error on conflicts (both remote and local have changes on the same item)" ) + .option( + "--raw", + "Push without using state, just overwrite. (Will be removed as a flag and made the default behavior in the future)" + ) .option("--yes", "Pull without needing confirmation") - .option("--raw", "Pull without using state, just overwrite.") + .option( + "--stateful", + "Pull using state tracking (create .wmill folder and needed for --fail-conflicts). Default currently but will change in favor of --raw" + ) .option("--plain-secrets", "Pull secrets as plain text") .option("--json", "Use JSON instead of YAML") .option("--skip-variables", "Skip syncing variables (including secrets)") @@ -922,9 +929,16 @@ const command = new Command() "--fail-conflicts", "Error on conflicts (both remote and local have changes on the same item)" ) - .option("--skip-pull", "Push without pulling first (you have pulled prior)") + .option( + "--raw", + "Push without using state, just overwrite. (Will be removed as a flag and made the default behavior in the future)" + ) + .option( + "--stateful", + "Pull using state tracking (use .wmill folder and needed for --fail-conflicts). Default currently but will change in favor of --raw" + ) + .option("--skip-pull", "(stateful only) Push without pulling first") .option("--yes", "Push without needing confirmation") - .option("--raw", "Push without using state, just overwrite.") .option("--plain-secrets", "Push secrets as plain text") .option("--json", "Use JSON instead of YAML") .option("--skip-variables", "Skip syncing variables (including secrets)")