From a0a1cb79e1a8f4e40e579d03bdc05b8969b65872 Mon Sep 17 00:00:00 2001
From: Joe Clark <jclark@openfn.org>
Date: Thu, 16 Oct 2025 18:19:39 +0100
Subject: [PATCH 1/2] add log option to checkout and merge

---
 .changeset/dark-ideas-bow.md         | 5 +++++
 packages/cli/src/checkout/command.ts | 4 ++--
 packages/cli/src/merge/command.ts    | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/dark-ideas-bow.md

diff --git a/.changeset/dark-ideas-bow.md b/.changeset/dark-ideas-bow.md
new file mode 100644
index 000000000..128761566
--- /dev/null
+++ b/.changeset/dark-ideas-bow.md
@@ -0,0 +1,5 @@
+---
+'@openfn/cli': patch
+---
+
+Add log option for checkout and merge
diff --git a/packages/cli/src/checkout/command.ts b/packages/cli/src/checkout/command.ts
index a31ba22b2..2a44b8de1 100644
--- a/packages/cli/src/checkout/command.ts
+++ b/packages/cli/src/checkout/command.ts
@@ -4,10 +4,10 @@ import { ensure, build } from '../util/command-builders';
 import * as o from '../options';
 
 export type CheckoutOptions = Required<
-  Pick<Opts, 'command' | 'projectName' | 'projectPath'>
+  Pick<Opts, 'command' | 'projectName' | 'projectPath' | 'log'>
 >;
 
-const options = [o.projectName, o.projectPath];
+const options = [o.projectName, o.projectPath, o.log];
 
 const checkoutCommand: yargs.CommandModule = {
   command: 'checkout <project-name>',
diff --git a/packages/cli/src/merge/command.ts b/packages/cli/src/merge/command.ts
index 0802a1221..f61db6750 100644
--- a/packages/cli/src/merge/command.ts
+++ b/packages/cli/src/merge/command.ts
@@ -11,6 +11,7 @@ export type MergeOptions = Required<
     | 'projectPath'
     | 'removeUnmapped'
     | 'workflowMappings'
+    | 'log'
   >
 >;
 
@@ -19,6 +20,7 @@ const options = [
   o.projectPath,
   o.removeUnmapped,
   o.workflowMappings,
+  o.log,
 ];
 
 const mergeCommand: yargs.CommandModule = {

From bcdc55ed7b0743328bbad34927743b4fed4dc68a Mon Sep 17 00:00:00 2001
From: Joe Clark <jclark@openfn.org>
Date: Thu, 16 Oct 2025 18:20:25 +0100
Subject: [PATCH 2/2] versions: cli@1.17.1

---
 .changeset/dark-ideas-bow.md | 5 -----
 packages/cli/CHANGELOG.md    | 6 ++++++
 packages/cli/package.json    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/dark-ideas-bow.md

diff --git a/.changeset/dark-ideas-bow.md b/.changeset/dark-ideas-bow.md
deleted file mode 100644
index 128761566..000000000
--- a/.changeset/dark-ideas-bow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@openfn/cli': patch
----
-
-Add log option for checkout and merge
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 157ac5ab6..e4c7a0cf2 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @openfn/cli
 
+## 1.17.1
+
+### Patch Changes
+
+- a0a1cb7: Add log option for checkout and merge
+
 ## 1.17.0
 
 ### Minor Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7119cae3e..5ed7e9b96 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "CLI devtools for the OpenFn toolchain",
   "engines": {
     "node": ">=18",