patchy-cli 0.0.24 → 0.0.25-pr.263.41531db

package/README.md

@@ -196,7 +196,7 @@ Note: `patchy generate` is destructive and will remove any unneeded files in the
 Apply patch files from `patches/` into `target_repo`. Patch sets are applied in alphabetical order.
 
 ```sh
-patchy apply [--only <patch-set>] [--until <patch-set>] [--auto-commit=<mode>] [--target-repo] [--patches-dir] [--dry-run]
+patchy apply [--only <patch-set>] [--until <patch-set>] [--auto-commit=<mode>] [--on-conflict=<mode>] [--target-repo] [--patches-dir] [--dry-run]
 ```
 
 | Flag | Description |
@@ -204,6 +204,39 @@ patchy apply [--only <patch-set>] [--until <patch-set>] [--auto-commit=<mode>] [
 | `--only <name>` | Apply only the specified patch set |
 | `--until <name>` | Apply patch sets up to and including the specified one |
 | `--auto-commit=<mode>` | Control auto-commit behavior (see below) |
+| `--on-conflict=<mode>` | How to handle patches that fail to apply (see below) |
+
+#### Conflict handling
+
+When a patch doesn't apply cleanly (e.g., the upstream file changed), patchy can insert git-style conflict markers for manual resolution.
+
+| Mode | Behavior |
+|------|----------|
+| `markers` (default) | Insert conflict markers and continue |
+| `error` | Fail immediately (previous behavior) |
+
+**Resolving conflicts:**
+
+When conflicts occur, patchy outputs instructions:
+```
+✗ Applied patches with conflicts to clones/my-repo
+
+To resolve:
+  1. Edit files in clones/my-repo to resolve conflicts (remove conflict markers)
+  2. Run: patchy generate --patch-set 001-fix
+  3. Commit the updated patches
+```
+
+Conflict markers look like standard git merge conflicts:
+```
+<<<<<<< current
+const value = 999;
+=======
+const value = 42;
+>>>>>>> file.ts.diff
+```
+
+Edit the file to keep the correct code, remove the marker lines, then regenerate the patch.
 
 #### Auto-commit behavior
 
@@ -238,9 +271,11 @@ patchy repo reset [--base-revision] [--target-repo]
 Clone a repository into a subdirectory of `clones_dir` and checkout `base_revision`. The target directory is derived from the repo name.
 
 ```sh
-patchy repo clone [--source-repo] [--clones-dir] [--base-revision]
+patchy repo clone [--source-repo] [--clones-dir] [--base-revision] [--yes]
 ```
 
+Use `--yes` to skip confirmation prompts and automatically update `patchy.json` with the new target directory.
+
 ---
 
 ### `patchy base [revision]`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchy-cli",
-  "version": "0.0.24",
+  "version": "0.0.25-pr.263.41531db",
   "description": "A CLI tool for managing Git patch workflows.",
   "type": "module",
   "bin": {
@@ -67,11 +67,11 @@
     "url": "https://github.com/richardgill/patchy"
   },
   "optionalDependencies": {
-    "patchy-cli-linux-x64": "0.0.24",
-    "patchy-cli-linux-arm64": "0.0.24",
-    "patchy-cli-darwin-x64": "0.0.24",
-    "patchy-cli-darwin-arm64": "0.0.24",
-    "patchy-cli-windows-x64": "0.0.24"
+    "patchy-cli-linux-x64": "0.0.25-pr.263.41531db",
+    "patchy-cli-linux-arm64": "0.0.25-pr.263.41531db",
+    "patchy-cli-darwin-x64": "0.0.25-pr.263.41531db",
+    "patchy-cli-darwin-arm64": "0.0.25-pr.263.41531db",
+    "patchy-cli-windows-x64": "0.0.25-pr.263.41531db"
   },
   "publishConfig": {
     "access": "public"