diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f36144e3..551024e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,7 @@
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches: [master]
 name: Test
 jobs:
   test:
diff --git a/README.md b/README.md
index 0353f942..c3a910b0 100644
--- a/README.md
+++ b/README.md
@@ -61,13 +61,15 @@ files.
 
 ### yarn v2+
 
-yarn 2+ have native support for patching dependencies via [`yarn patch`](https://yarnpkg.com/cli/patch).
-You do not need to use patch-package on these projects.
+yarn 2+ have native support for patching dependencies via
+[`yarn patch`](https://yarnpkg.com/cli/patch). You do not need to use
+patch-package on these projects.
 
 ### pnpm
 
-pnpm has native support for patching dependencies via [`pnpm patch`](https://pnpm.io/cli/patch).
-You do not need to use patch-package on these projects.
+pnpm has native support for patching dependencies via
+[`pnpm patch`](https://pnpm.io/cli/patch). You do not need to use patch-package
+on these projects.
 
 ### Heroku
 
@@ -88,9 +90,12 @@ details.
   Otherwise if you update a patch then the change may not be reflected on
   subsequent CI runs.
 
-  
 ### CircleCI
-Create a hash of your patches before loading/saving your cache. If using a Linux machine, run `md5sum patches/* > patches.hash`. If running on a macOS machine,  use `md5 patches/* > patches.hash`
+
+Create a hash of your patches before loading/saving your cache. If using a Linux
+machine, run `md5sum patches/* > patches.hash`. If running on a macOS machine,
+use `md5 patches/* > patches.hash`
+
 ```yaml
 - run:
     name: patch-package hash
@@ -98,20 +103,25 @@ Create a hash of your patches before loading/saving your cache. If using a Linux
 ```
 
 Then, update your hash key to include a checksum of that file:
+
 ```yaml
 - restore_cache:
-    key: app-node_modules-v1-{{ checksum "yarn.lock" }}-{{ checksum "patches.hash" }}
-```  
+    key:
+      app-node_modules-v1-{{ checksum "yarn.lock" }}-{{ checksum "patches.hash"
+      }}
+```
 
 As well as the save_cache
+
 ```yaml
 - save_cache:
-    key: app-node_modules-v1-{{ checksum "yarn.lock" }}-{{ checksum "patches.hash" }}
+    key:
+      app-node_modules-v1-{{ checksum "yarn.lock" }}-{{ checksum "patches.hash"
+      }}
     paths:
       - ./node_modules
 ```
 
-
 ## Usage
 
 ### Making patches
@@ -248,6 +258,107 @@ to
 This will allow those patch files to be safely ignored when
 `NODE_ENV=production`.
 
+### Creating multiple patches for the same package
+
+_💡 This is an advanced feature and is not recommended unless you really, really
+need it._
+
+Let's say you have a patch for react-native called
+
+- `patches/react-native+0.72.0.patch`
+
+If you want to add another patch file to `react-native`, you can use the
+`--append` flag while supplying a name for the patch.
+
+Just make you changes inside `node_modules/react-native` then run e.g.
+
+    npx patch-package react-native --append 'fix-touchable-opacity'
+
+This will create a new patch file while renaming the old patch file so that you
+now have:
+
+- `patches/react-native+0.72.0+001+initial.patch`
+- `patches/react-native+0.72.0+002+fix-touchable-opacity.patch`
+
+The patches are ordered in a sequence, so that they can build on each other if
+necessary. **Think of these as commits in a git history**.
+
+#### Updating a sequenced patch file
+
+If the patch file is the last one in the sequence, you can just make your
+changes inside e.g. `node_modules/react-native` and then run
+
+    npx patch-package react-native
+
+This will update the last patch file in the sequence.
+
+If the patch file is not the last one in the sequence **you need to use the
+`--rebase` feature** to un-apply the succeeding patch files first.
+
+Using the example above, let's say you want to update the `001+initial` patch
+but leave the other patch alone. You can run
+
+    npx patch-package react-native --rebase patches/react-native+0.72.0+001+initial.patch
+
+This will undo the `002-fix-touchable-opacity` patch file. You can then make
+your changes and run
+
+    npx patch-package react-native
+
+to finish the rebase by updating the `001+initial` patch file and re-apply the
+`002-fix-touchable-opacity` patch file, leaving you with all patches applied and
+up-to-date.
+
+#### Inserting a new patch file in the middle of an existing sequence
+
+Using the above example, let's say you want to insert a new patch file between
+the `001+initial` and `002+fix-touchable-opacity` patch files. You can run
+
+    npx patch-package react-native --rebase patches/react-native+0.72.0+001+initial.patch
+
+This will undo the `002-fix-touchable-opacity` patch file. You can then make any
+changes you want to insert in a new patch file and run
+
+    npx patch-package react-native --append 'fix-console-warnings'
+
+This will create a new patch file while renaming any successive patches to
+maintain the sequence order, leaving you with
+
+- `patches/react-native+0.72.0+001+initial.patch`
+- `patches/react-native+0.72.0+002+fix-console-warnings.patch`
+- `patches/react-native+0.72.0+003+fix-touchable-opacity.patch`
+
+To insert a new patch file at the start of the sequence, you can run
+
+    npx patch-package react-native --rebase 0
+
+Which will un-apply all patch files in the sequence. Then follow the process
+above to create a new patch file numbered `001`.
+
+#### Deleting a sequenced patch file
+
+To delete a sequenced patch file, just delete it, then remove and reinstall your
+`node_modules` folder.
+
+If you deleted one of the patch files other than the last one, you don't need to
+update the sequence numbers in the successive patch file names, but you might
+want to do so to keep things tidy.
+
+#### Partially applying a broken patch file
+
+Normally patch application is atomic per patch file. i.e. if a patch file
+contains an error anywhere then none of the changes in the patch file will be
+applied and saved to disk.
+
+This can be problematic if you have a patch with many changes and you want to
+keep some of them and update others.
+
+In this case you can use the `--partial` option. Patch-package will apply as
+many of the changes as it can and then leave it to you to fix the rest.
+
+Any errors encountered will be written to a file `./patch-package-errors.log` to
+help you keep track of what needs fixing.
+
 ## Benefits of patching over forking
 
 - Sometimes forks need extra build steps, e.g. with react-native for Android.
diff --git a/integration-tests/append-patches/__snapshots__/append-patches.test.ts.snap b/integration-tests/append-patches/__snapshots__/append-patches.test.ts.snap
new file mode 100644
index 00000000..a91095be
--- /dev/null
+++ b/integration-tests/append-patches/__snapshots__/append-patches.test.ts.snap
@@ -0,0 +1,98 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test append-patches: 00: basic patch file 1`] = `
+"SNAPSHOT: basic patch file
+left-pad+1.3.0.patch
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 01: after appending a patch file 1`] = `
+"SNAPSHOT: after appending a patch file
+left-pad+1.3.0+001+initial.patch
+left-pad+1.3.0+002+MillionDollars.patch
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 02: the second patch file should go from patch-package to a million dollars 1`] = `
+"SNAPSHOT: the second patch file should go from patch-package to a million dollars
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index a409e14..73d2a7c 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use patch-package';
++'use a million dollars';
+ module.exports = leftPad;
+ 
+ var cache = [
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 03: creating a first patch file with --append 1`] = `
+"SNAPSHOT: creating a first patch file with --append
+left-pad+1.3.0+001+FirstPatch.patch
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 04: the squashed patch file should go from use strict to a million dollars 1`] = `
+"SNAPSHOT: the squashed patch file should go from use strict to a million dollars
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..73d2a7c 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use a million dollars';
+ module.exports = leftPad;
+ 
+ var cache = [
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 05: after appending a billion dollars 1`] = `
+"SNAPSHOT: after appending a billion dollars
+left-pad+1.3.0+001+FirstPatch.patch
+left-pad+1.3.0+002+BillionDollars.patch
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 06: after updating the appended patch file to a TRILLION dollars 1`] = `
+"SNAPSHOT: after updating the appended patch file to a TRILLION dollars
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 73d2a7c..f53ea10 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use a million dollars';
++'use a trillion dollars';
+ module.exports = leftPad;
+ 
+ var cache = [
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 07: patch-package fails when a patch in the sequence is invalid 1`] = `
+"SNAPSHOT: patch-package fails when a patch in the sequence is invalid
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with npm
+• Diffing your files with clean files
+Failed to apply patch left-pad+1.3.0+001+FirstPatch.patch to left-pad
+END SNAPSHOT"
+`;
+
+exports[`Test append-patches: 08: --append is not compatible with --create-issue 1`] = `
+"SNAPSHOT: --append is not compatible with --create-issue
+patch-package 0.0.0
+--create-issue is not compatible with --append.
+END SNAPSHOT"
+`;
diff --git a/integration-tests/append-patches/append-patches.sh b/integration-tests/append-patches/append-patches.sh
new file mode 100755
index 00000000..cefbe9f6
--- /dev/null
+++ b/integration-tests/append-patches/append-patches.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+# make sure errors stop the script
+set -e
+
+npm install
+
+echo "add patch-package"
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
+
+function replace {
+  npx replace "$1" "$2" node_modules/left-pad/index.js
+}
+
+echo "making an initial patch file does not add a sequence number to the file by default"
+replace 'use strict' 'use patch-package'
+
+patch-package left-pad
+
+echo "SNAPSHOT: basic patch file"
+ls patches
+echo "END SNAPSHOT"
+
+echo "using --apend creates a patch file with a sequence number and updates the original patch file"
+
+replace 'use patch-package' 'use a million dollars'
+
+patch-package left-pad --append 'MillionDollars'
+
+echo "SNAPSHOT: after appending a patch file"
+ls patches
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: the second patch file should go from patch-package to a million dollars"
+cat patches/left-pad*MillionDollars.patch
+echo "END SNAPSHOT"
+
+echo "we can squash the patches together by deleting the patch files"
+rm patches/left-pad*patch
+
+patch-package left-pad --append 'FirstPatch'
+
+echo "SNAPSHOT: creating a first patch file with --append"
+ls patches
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: the squashed patch file should go from use strict to a million dollars"
+cat patches/left-pad*FirstPatch.patch
+echo "END SNAPSHOT"
+
+echo "i can update an appended patch file"
+
+replace 'use a million dollars' 'use a billion dollars'
+
+patch-package left-pad --append 'BillionDollars'
+
+echo "SNAPSHOT: after appending a billion dollars"
+ls patches
+echo "END SNAPSHOT"
+
+replace 'use a billion dollars' 'use a trillion dollars'
+patch-package left-pad 
+
+echo "SNAPSHOT: after updating the appended patch file to a TRILLION dollars"
+cat patches/left-pad*BillionDollars.patch
+echo "END SNAPSHOT"
+
+echo "if one of the patches in the sequence is invalid, the sequence is not applied"
+npx replace 'use strict' 'use bananas'  patches/*FirstPatch.patch
+
+echo "SNAPSHOT: patch-package fails when a patch in the sequence is invalid"
+if patch-package left-pad --append 'Bananas' ; then
+  exit 1
+fi
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: --append is not compatible with --create-issue"
+if patch-package left-pad --append 'Bananas' --create-issue ; then
+  exit 1
+fi
+echo "END SNAPSHOT"
\ No newline at end of file
diff --git a/integration-tests/delete-old-patch-files/delete-old-patch-files.test.ts b/integration-tests/append-patches/append-patches.test.ts
similarity index 52%
rename from integration-tests/delete-old-patch-files/delete-old-patch-files.test.ts
rename to integration-tests/append-patches/append-patches.test.ts
index 024d27f1..ddc8e190 100644
--- a/integration-tests/delete-old-patch-files/delete-old-patch-files.test.ts
+++ b/integration-tests/append-patches/append-patches.test.ts
@@ -1,5 +1,5 @@
 import { runIntegrationTest } from "../runIntegrationTest"
 runIntegrationTest({
-  projectName: "delete-old-patch-files",
-  shouldProduceSnapshots: false,
+  projectName: "append-patches",
+  shouldProduceSnapshots: true,
 })
diff --git a/integration-tests/append-patches/package-lock.json b/integration-tests/append-patches/package-lock.json
new file mode 100644
index 00000000..a2fe7182
--- /dev/null
+++ b/integration-tests/append-patches/package-lock.json
@@ -0,0 +1,381 @@
+{
+  "name": "append-patches",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "append-patches",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "^1.3.0",
+        "replace": "^1.2.2"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/replace": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/replace/-/replace-1.2.2.tgz",
+      "integrity": "sha512-C4EDifm22XZM2b2JOYe6Mhn+lBsLBAvLbK8drfUQLTfD1KYl/n3VaW/CDju0Ny4w3xTtegBpg8YNSpFJPUDSjA==",
+      "dependencies": {
+        "chalk": "2.4.2",
+        "minimatch": "3.0.5",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "replace": "bin/replace.js",
+        "search": "bin/search.js"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}
diff --git a/integration-tests/delete-old-patch-files/package.json b/integration-tests/append-patches/package.json
similarity index 63%
rename from integration-tests/delete-old-patch-files/package.json
rename to integration-tests/append-patches/package.json
index 0b47a359..d3361126 100644
--- a/integration-tests/delete-old-patch-files/package.json
+++ b/integration-tests/append-patches/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "delete-old-patch-files",
+  "name": "append-patches",
   "version": "1.0.0",
   "description": "integration test for patch-package",
   "main": "index.js",
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@types/lodash": "^4.14.120",
-    "lodash": "^4.17.11"
+    "left-pad": "^1.3.0",
+    "replace": "^1.2.2"
   }
 }
diff --git a/integration-tests/apply-multiple-patches/__snapshots__/apply-multiple-patches.test.ts.snap b/integration-tests/apply-multiple-patches/__snapshots__/apply-multiple-patches.test.ts.snap
new file mode 100644
index 00000000..dd054be3
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/__snapshots__/apply-multiple-patches.test.ts.snap
@@ -0,0 +1,118 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test apply-multiple-patches: 00: patch-package happily applies all three good patches 1`] = `
+"SNAPSHOT: patch-package happily applies all three good patches
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (1 hello) ✔
+left-pad@1.3.0 (3 world) ✔
+left-pad@1.3.0 (4 goodbye) ✔
+END SNAPSHOT"
+`;
+
+exports[`Test apply-multiple-patches: 01: patch-package stores a state file to list the patches that have been applied 1`] = `
+"SNAPSHOT: patch-package stores a state file to list the patches that have been applied
+{
+    \\"isRebasing\\": false,
+    \\"patches\\": [
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"404c604ed830db6a0605f86cb9165ced136848f70986b23bf877bcf38968c1c9\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+001+hello.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"f2859c7193de8d9578bdde7e226de516adc8d972d6e76997cbe1f41b1a535359\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+003+world.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"946d4e578decc1e475ca9b0de07353791969312fd2bf5d9cfc5182b86d9804ad\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+004+goodbye.patch\\"
+        }
+    ],
+    \\"version\\": 1
+}END SNAPSHOT"
+`;
+
+exports[`Test apply-multiple-patches: 02: patch-package fails when a patch in the sequence is invalid 1`] = `
+"SNAPSHOT: patch-package fails when a patch in the sequence is invalid
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (1 hello) ✔
+
+⛔ ERROR
+
+Failed to apply patch file left-pad+1.3.0+002+broken.patch.
+
+If this patch file is no longer useful, delete it and run
+
+  patch-package
+
+To partially apply the patch (if possible) and output a log of errors to fix, run
+
+  patch-package --partial
+
+After which you should make any required changes inside node_modules/left-pad, and finally run
+
+  patch-package left-pad
+
+to update the patch file.
+
+END SNAPSHOT"
+`;
+
+exports[`Test apply-multiple-patches: 03: patch-package only applies the first patch if the second of three is invalid 1`] = `
+"SNAPSHOT: patch-package only applies the first patch if the second of three is invalid
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (1 hello) ✔
+
+⛔ ERROR
+
+Failed to apply patch file left-pad+1.3.0+002+broken.patch.
+
+If this patch file is no longer useful, delete it and run
+
+  patch-package
+
+To partially apply the patch (if possible) and output a log of errors to fix, run
+
+  patch-package --partial
+
+After which you should make any required changes inside node_modules/left-pad, and finally run
+
+  patch-package left-pad
+
+to update the patch file.
+
+END SNAPSHOT"
+`;
+
+exports[`Test apply-multiple-patches: 04: patch-package stores a state file of only the first patch if there was an error 1`] = `
+"SNAPSHOT: patch-package stores a state file of only the first patch if there was an error
+{
+    \\"isRebasing\\": true,
+    \\"patches\\": [
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"404c604ed830db6a0605f86cb9165ced136848f70986b23bf877bcf38968c1c9\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+001+hello.patch\\"
+        },
+        {
+            \\"didApply\\": false,
+            \\"patchContentHash\\": \\"9c5c141e2578b4178fd57dd7726488c2f7eab32e23a7848701da29dcb371b9f2\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+002+broken.patch\\"
+        }
+    ],
+    \\"version\\": 1
+}END SNAPSHOT"
+`;
+
+exports[`Test apply-multiple-patches: 05: patch-package fails when a patch file is removed 1`] = `
+"SNAPSHOT: patch-package fails when a patch file is removed
+patch-package 0.0.0
+Applying patches...
+Error: The patches for left-pad have changed. You should reinstall your node_modules folder to make sure the package is up to date
+END SNAPSHOT"
+`;
diff --git a/integration-tests/apply-multiple-patches/apply-multiple-patches.sh b/integration-tests/apply-multiple-patches/apply-multiple-patches.sh
new file mode 100755
index 00000000..f8a344aa
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/apply-multiple-patches.sh
@@ -0,0 +1,55 @@
+# make sure errors stop the script
+set -e
+
+npm install
+
+echo "add patch-package"
+npm add $1
+alias patch-package=./node_modules/.bin/patch-package
+
+
+echo "SNAPSHOT: patch-package happily applies all three good patches"
+patch-package
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: patch-package stores a state file to list the patches that have been applied"
+cat node_modules/left-pad/.patch-package.json
+echo "END SNAPSHOT"
+
+echo "it should work if we apply them again even though they touch the same parts of the code"
+if ! patch-package
+then
+  exit 1
+fi
+
+cp *broken.patch patches/
+
+rm -rf node_modules
+npm install
+echo "SNAPSHOT: patch-package fails when a patch in the sequence is invalid"
+if patch-package
+then
+  exit 1
+fi
+echo "END SNAPSHOT"
+
+
+echo "SNAPSHOT: patch-package only applies the first patch if the second of three is invalid"
+if patch-package
+then
+  exit 1
+fi
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: patch-package stores a state file of only the first patch if there was an error"
+cat node_modules/left-pad/.patch-package.json
+echo "END SNAPSHOT"
+
+
+rm patches/*hello.patch
+echo "SNAPSHOT: patch-package fails when a patch file is removed"
+if patch-package
+then
+  exit 1
+fi
+echo "END SNAPSHOT"
\ No newline at end of file
diff --git a/integration-tests/apply-multiple-patches/apply-multiple-patches.test.ts b/integration-tests/apply-multiple-patches/apply-multiple-patches.test.ts
new file mode 100644
index 00000000..e8e3b474
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/apply-multiple-patches.test.ts
@@ -0,0 +1,5 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({
+  projectName: "apply-multiple-patches",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/apply-multiple-patches/left-pad+1.3.0+002+broken.patch b/integration-tests/apply-multiple-patches/left-pad+1.3.0+002+broken.patch
new file mode 100644
index 00000000..2b9045c6
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/left-pad+1.3.0+002+broken.patch
@@ -0,0 +1,9 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..409dad7 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -1,3 +1,4 @@
++// hello. this is the first patch
+ /* Thos program is free software. It comes without any warranty, to
+      * the extent permitted by applicable law. You can redistribute it
+      * and/or modify it under the terms of the Do What The Fuck You Want
diff --git a/integration-tests/apply-multiple-patches/package-lock.json b/integration-tests/apply-multiple-patches/package-lock.json
new file mode 100644
index 00000000..28665694
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/package-lock.json
@@ -0,0 +1,20 @@
+{
+  "name": "apply-multiple-patches",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "apply-multiple-patches",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "^1.3.0"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "license": "WTFPL"
+    }
+  }
+}
diff --git a/integration-tests/apply-multiple-patches/package.json b/integration-tests/apply-multiple-patches/package.json
new file mode 100644
index 00000000..e7f53fc8
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "apply-multiple-patches",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "^1.3.0"
+  }
+}
diff --git a/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+001+hello.patch b/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+001+hello.patch
new file mode 100644
index 00000000..a77d5b29
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+001+hello.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+003+world.patch b/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+003+world.patch
new file mode 100644
index 00000000..6ae65ba6
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+003+world.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..5aa41be 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+004+goodbye.patch b/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+004+goodbye.patch
new file mode 100644
index 00000000..cd6a650e
--- /dev/null
+++ b/integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+004+goodbye.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..2beca7e 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use world';
++'goodbye world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/broken-patch-file/__snapshots__/broken-patch-file.test.ts.snap b/integration-tests/broken-patch-file/__snapshots__/broken-patch-file.test.ts.snap
index e96c5079..afebace1 100644
--- a/integration-tests/broken-patch-file/__snapshots__/broken-patch-file.test.ts.snap
+++ b/integration-tests/broken-patch-file/__snapshots__/broken-patch-file.test.ts.snap
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test broken-patch-file: patch-package fails when patch file is invalid 1`] = `
+exports[`Test broken-patch-file: 00: patch-package fails when patch file is invalid 1`] = `
 "SNAPSHOT: patch-package fails when patch file is invalid
+patch-package 0.0.0
+Applying patches...
 
 **ERROR** Failed to apply patch for package left-pad at path
   
diff --git a/integration-tests/broken-patch-file/broken-patch-file.sh b/integration-tests/broken-patch-file/broken-patch-file.sh
index 33d102a7..2813ebd5 100755
--- a/integration-tests/broken-patch-file/broken-patch-file.sh
+++ b/integration-tests/broken-patch-file/broken-patch-file.sh
@@ -5,9 +5,9 @@ echo "add patch-package"
 yarn add $1
 alias patch-package=./node_modules/.bin/patch-package
 
-(>&2 echo "SNAPSHOT: patch-package fails when patch file is invalid")
+echo "SNAPSHOT: patch-package fails when patch file is invalid"
 if patch-package
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
diff --git a/integration-tests/collate-errors/__snapshots__/collate-errors.test.ts.snap b/integration-tests/collate-errors/__snapshots__/collate-errors.test.ts.snap
index 5f825fad..5d756db7 100644
--- a/integration-tests/collate-errors/__snapshots__/collate-errors.test.ts.snap
+++ b/integration-tests/collate-errors/__snapshots__/collate-errors.test.ts.snap
@@ -1,17 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test collate-errors: left-pad, lodash, and zfs apply 1`] = `
+exports[`Test collate-errors: 00: left-pad, lodash, and zfs apply 1`] = `
 "SNAPSHOT: left-pad, lodash, and zfs apply
+SNAPSHOT: underscore does not apply, left-pad warns
 patch-package 0.0.0
 Applying patches...
 left-pad@1.1.1 ✔
 lodash@4.17.21 ✔
 zfs@1.3.0 ✔
-END SNAPSHOT"
-`;
-
-exports[`Test collate-errors: underscore does not apply, left-pad warns 1`] = `
-"SNAPSHOT: underscore does not apply, left-pad warns
 
 Warning: patch-package detected a patch file version mismatch
 
diff --git a/integration-tests/collate-errors/collate-errors.sh b/integration-tests/collate-errors/collate-errors.sh
index a16b6aeb..9da30e8f 100755
--- a/integration-tests/collate-errors/collate-errors.sh
+++ b/integration-tests/collate-errors/collate-errors.sh
@@ -6,10 +6,10 @@ yarn add $1
 alias patch-package=./node_modules/.bin/patch-package
 
 echo "SNAPSHOT: left-pad, lodash, and zfs apply"
-(>&2 echo "SNAPSHOT: underscore does not apply, left-pad warns")
+echo "SNAPSHOT: underscore does not apply, left-pad warns"
 if patch-package;
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 echo "END SNAPSHOT"
\ No newline at end of file
diff --git a/integration-tests/create-issue/__snapshots__/create-issue.test.ts.snap b/integration-tests/create-issue/__snapshots__/create-issue.test.ts.snap
index ae8bc353..a7d96c48 100644
--- a/integration-tests/create-issue/__snapshots__/create-issue.test.ts.snap
+++ b/integration-tests/create-issue/__snapshots__/create-issue.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test create-issue: patching left-pad prompts to submit an issue 1`] = `
+exports[`Test create-issue: 00: patching left-pad prompts to submit an issue 1`] = `
 "SNAPSHOT: patching left-pad prompts to submit an issue
 patch-package 0.0.0
 • Creating temporary folder
@@ -15,7 +15,7 @@ patch-package 0.0.0
 END SNAPSHOT"
 `;
 
-exports[`Test create-issue: patching left-pad with --create-issue opens the url 1`] = `
+exports[`Test create-issue: 01: patching left-pad with --create-issue opens the url 1`] = `
 "SNAPSHOT: patching left-pad with --create-issue opens the url
 patch-package 0.0.0
 • Creating temporary folder
diff --git a/integration-tests/delete-old-patch-files/delete-old-patch-files.sh b/integration-tests/delete-old-patch-files/delete-old-patch-files.sh
deleted file mode 100755
index ae6a5400..00000000
--- a/integration-tests/delete-old-patch-files/delete-old-patch-files.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-# make sure errors stop the script
-set -e
-
-echo "add patch-package"
-yarn add $1
-alias patch-package=./node_modules/.bin/patch-package
-
-echo "apply patch-package"
-patch-package
-
-echo "make sure the changes were applied"
-grep patch-package node_modules/@types/lodash/index.d.ts
-grep patchPackage node_modules/lodash/index.js
-
-echo "make sure the files were still named like before"
-ls patches/lodash:4.17.11.patch
-ls patches/@types/lodash:4.14.120.patch
-
-echo "make patch files again"
-patch-package lodash @types/lodash
-
-echo "make sure the changes were still applied"
-grep patch-package node_modules/@types/lodash/index.d.ts
-grep patchPackage node_modules/lodash/index.js
-
-echo "make sure the file names have changed"
-if ls patches/lodash:4.17.11.patch; then
-  exit 1
-fi
-if ls patches/@types/lodash:4.14.120.patch; then
-  exit 1
-fi
-ls patches/lodash+4.17.11.patch
-ls patches/@types+lodash+4.14.120.patch
diff --git a/integration-tests/delete-old-patch-files/patches/@types/lodash:4.14.120.patch b/integration-tests/delete-old-patch-files/patches/@types/lodash:4.14.120.patch
deleted file mode 100644
index c9e104d4..00000000
--- a/integration-tests/delete-old-patch-files/patches/@types/lodash:4.14.120.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/node_modules/@types/lodash/index.d.ts b/node_modules/@types/lodash/index.d.ts
-index 95228b8..e4eaa37 100644
---- a/node_modules/@types/lodash/index.d.ts
-+++ b/node_modules/@types/lodash/index.d.ts
-@@ -1,6 +1,6 @@
- // Type definitions for Lo-Dash 4.14
- // Project: http://lodash.com/
--// Definitions by: Brian Zengel <https://github.com/bczengel>,
-+// patch-package by: Brian Zengel <https://github.com/bczengel>,
- //                 Ilya Mochalov <https://github.com/chrootsu>,
- //                 Stepan Mikhaylyuk <https://github.com/stepancar>,
- //                 AJ Richardson <https://github.com/aj-r>,
-@@ -43,5 +43,5 @@ declare global {
-     // tslint:disable-next-line:no-empty-interface
-     interface WeakSet<T> { }
-     // tslint:disable-next-line:no-empty-interface
--    interface WeakMap<K extends object, V> { }
-+    patch-package WeakMap<K extends object, V> { }
- }
diff --git a/integration-tests/delete-old-patch-files/patches/lodash:4.17.11.patch b/integration-tests/delete-old-patch-files/patches/lodash:4.17.11.patch
deleted file mode 100644
index 57cea30e..00000000
--- a/integration-tests/delete-old-patch-files/patches/lodash:4.17.11.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/node_modules/lodash/index.js b/node_modules/lodash/index.js
-index 5d063e2..9fe7004 100644
---- a/node_modules/lodash/index.js
-+++ b/node_modules/lodash/index.js
-@@ -1 +1 @@
--module.exports = require('./lodash');
-\ No newline at end of file
-+module.patchPackage = require('./lodash');
diff --git a/integration-tests/delete-old-patch-files/yarn.lock b/integration-tests/delete-old-patch-files/yarn.lock
deleted file mode 100644
index 6afddab6..00000000
--- a/integration-tests/delete-old-patch-files/yarn.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/lodash@^4.14.120":
-  version "4.14.120"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.120.tgz#cf265d06f6c7a710db087ed07523ab8c1a24047b"
-  integrity sha512-jQ21kQ120mo+IrDs1nFNVm/AsdFxIx2+vZ347DbogHJPd/JzKNMOqU6HCYin1W6v8l5R9XSO2/e9cxmn7HAnVw==
-
-lodash@^4.17.11:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
diff --git a/integration-tests/delete-scripts/__snapshots__/delete-scripts.test.ts.snap b/integration-tests/delete-scripts/__snapshots__/delete-scripts.test.ts.snap
index 734a41f3..93ed1585 100644
--- a/integration-tests/delete-scripts/__snapshots__/delete-scripts.test.ts.snap
+++ b/integration-tests/delete-scripts/__snapshots__/delete-scripts.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test delete-scripts: a patch file got produced 1`] = `
+exports[`Test delete-scripts: 00: a patch file got produced 1`] = `
 "SNAPSHOT: a patch file got produced
 diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
 index e90aec3..f2b8b0a 100644
diff --git a/integration-tests/dev-only-patches/__snapshots__/dev-only-patches.test.ts.snap b/integration-tests/dev-only-patches/__snapshots__/dev-only-patches.test.ts.snap
index 3f4d539b..5eb97868 100644
--- a/integration-tests/dev-only-patches/__snapshots__/dev-only-patches.test.ts.snap
+++ b/integration-tests/dev-only-patches/__snapshots__/dev-only-patches.test.ts.snap
@@ -1,17 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test dev-only-patches: fake-package should be skipped 1`] = `
-"SNAPSHOT: fake-package should be skipped
+exports[`Test dev-only-patches: 00: patch-package happily ignores slash on CI because it's a dev dep 1`] = `
+"SNAPSHOT: patch-package happily ignores slash on CI because it's a dev dep
 patch-package 0.0.0
 Applying patches...
-Skipping dev-only fake-package@3.0.0 ✔
 left-pad@1.3.0 ✔
 Skipping dev-only slash@3.0.0 ✔
 END SNAPSHOT"
 `;
 
-exports[`Test dev-only-patches: patch-package fails to find fake-package 1`] = `
+exports[`Test dev-only-patches: 01: patch-package fails to find fake-package 1`] = `
 "SNAPSHOT: patch-package fails to find fake-package
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 ✔
+Skipping dev-only slash@3.0.0 ✔
 Error: Patch file found for package fake-package which is not present at node_modules/fake-package
 
   If this package is a dev dependency, rename the patch file to
@@ -23,10 +26,11 @@ patch-package finished with 1 error(s).
 END SNAPSHOT"
 `;
 
-exports[`Test dev-only-patches: patch-package happily ignores slash on CI because it's a dev dep 1`] = `
-"SNAPSHOT: patch-package happily ignores slash on CI because it's a dev dep
+exports[`Test dev-only-patches: 02: fake-package should be skipped 1`] = `
+"SNAPSHOT: fake-package should be skipped
 patch-package 0.0.0
 Applying patches...
+Skipping dev-only fake-package@3.0.0 ✔
 left-pad@1.3.0 ✔
 Skipping dev-only slash@3.0.0 ✔
 END SNAPSHOT"
diff --git a/integration-tests/dev-only-patches/dev-only-patches.sh b/integration-tests/dev-only-patches/dev-only-patches.sh
index 98a5a130..4030906a 100755
--- a/integration-tests/dev-only-patches/dev-only-patches.sh
+++ b/integration-tests/dev-only-patches/dev-only-patches.sh
@@ -16,12 +16,12 @@ echo "END SNAPSHOT"
 echo "create fake-package+3.0.0.patch"
 cp patches/slash+3.0.0.patch patches/fake-package+3.0.0.patch
 
-(>&2 echo "SNAPSHOT: patch-package fails to find fake-package")
+echo "SNAPSHOT: patch-package fails to find fake-package"
 if patch-package
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "rename fake-package patch file to .dev.patch"
 mv patches/fake-package+3.0.0.patch patches/fake-package+3.0.0.dev.patch
diff --git a/integration-tests/error-on-fail/__snapshots__/error-on-fail.test.ts.snap b/integration-tests/error-on-fail/__snapshots__/error-on-fail.test.ts.snap
index 51d60d66..296a6d81 100644
--- a/integration-tests/error-on-fail/__snapshots__/error-on-fail.test.ts.snap
+++ b/integration-tests/error-on-fail/__snapshots__/error-on-fail.test.ts.snap
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test error-on-fail: at dev time patch-package fails but returns 0 1`] = `
+exports[`Test error-on-fail: 00: at dev time patch-package fails but returns 0 1`] = `
 "SNAPSHOT: at dev time patch-package fails but returns 0
+patch-package 0.0.0
+Applying patches...
 
 **ERROR** Failed to apply patch for package left-pad at path
   
diff --git a/integration-tests/error-on-fail/error-on-fail.sh b/integration-tests/error-on-fail/error-on-fail.sh
index ee3b7635..2765323c 100755
--- a/integration-tests/error-on-fail/error-on-fail.sh
+++ b/integration-tests/error-on-fail/error-on-fail.sh
@@ -8,12 +8,12 @@ alias patch-package=./node_modules/.bin/patch-package
 export NODE_ENV="development"
 export CI="true"
 
-(>&2 echo "SNAPSHOT: at dev time patch-package fails but returns 0")
+echo "SNAPSHOT: at dev time patch-package fails but returns 0"
 if ! patch-package;
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "adding --error-on-fail forces patch-package to return 1 at dev time"
 if patch-package --error-on-fail;
diff --git a/integration-tests/error-on-warn/__snapshots__/error-on-warn.test.ts.snap b/integration-tests/error-on-warn/__snapshots__/error-on-warn.test.ts.snap
index 61340a24..590d5750 100644
--- a/integration-tests/error-on-warn/__snapshots__/error-on-warn.test.ts.snap
+++ b/integration-tests/error-on-warn/__snapshots__/error-on-warn.test.ts.snap
@@ -1,7 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test error-on-warn: at dev time patch-package warns but returns 0 1`] = `
+exports[`Test error-on-warn: 00: at dev time patch-package warns but returns 0 1`] = `
 "SNAPSHOT: at dev time patch-package warns but returns 0
+patch-package 0.0.0
+Applying patches...
+left-pad@1.1.2 ✔
 
 Warning: patch-package detected a patch file version mismatch
 
diff --git a/integration-tests/error-on-warn/error-on-warn.sh b/integration-tests/error-on-warn/error-on-warn.sh
index aa1459d9..af31eb65 100755
--- a/integration-tests/error-on-warn/error-on-warn.sh
+++ b/integration-tests/error-on-warn/error-on-warn.sh
@@ -8,12 +8,12 @@ alias patch-package=./node_modules/.bin/patch-package
 export NODE_ENV="development"
 export CI=""
 
-(>&2 echo "SNAPSHOT: at dev time patch-package warns but returns 0")
+echo "SNAPSHOT: at dev time patch-package warns but returns 0"
 if ! patch-package;
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "adding --error-on-warn forces patch-package to return 1 at dev time"
 if patch-package --error-on-warn;
diff --git a/integration-tests/fails-when-no-package/__snapshots__/fails-when-no-package.test.ts.snap b/integration-tests/fails-when-no-package/__snapshots__/fails-when-no-package.test.ts.snap
index 028a53b7..ef54f873 100644
--- a/integration-tests/fails-when-no-package/__snapshots__/fails-when-no-package.test.ts.snap
+++ b/integration-tests/fails-when-no-package/__snapshots__/fails-when-no-package.test.ts.snap
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test fails-when-no-package: no package present failure 1`] = `
+exports[`Test fails-when-no-package: 00: no package present failure 1`] = `
 "SNAPSHOT: no package present failure
+patch-package 0.0.0
+Applying patches...
 Error: Patch file found for package left-pad which is not present at node_modules/left-pad
 ---
 patch-package finished with 1 error(s).
diff --git a/integration-tests/fails-when-no-package/fails-when-no-package.sh b/integration-tests/fails-when-no-package/fails-when-no-package.sh
index b35f9503..a9564692 100755
--- a/integration-tests/fails-when-no-package/fails-when-no-package.sh
+++ b/integration-tests/fails-when-no-package/fails-when-no-package.sh
@@ -5,8 +5,8 @@ echo "add patch-package"
 yarn add $1
 alias patch-package=./node_modules/.bin/patch-package
 
-(>&2 echo "SNAPSHOT: no package present failure")
+echo "SNAPSHOT: no package present failure"
 if patch-package; then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
diff --git a/integration-tests/file-mode-changes/__snapshots__/file-mode-changes.test.ts.snap b/integration-tests/file-mode-changes/__snapshots__/file-mode-changes.test.ts.snap
index 9bffcbf4..1a1f3dfc 100644
--- a/integration-tests/file-mode-changes/__snapshots__/file-mode-changes.test.ts.snap
+++ b/integration-tests/file-mode-changes/__snapshots__/file-mode-changes.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test file-mode-changes: the patch file 1`] = `
+exports[`Test file-mode-changes: 00: the patch file 1`] = `
 "SNAPSHOT: the patch file
 diff --git a/node_modules/prettier/bin-prettier.js b/node_modules/prettier/bin-prettier.js
 old mode 100755
diff --git a/integration-tests/happy-path-npm/__snapshots__/happy-path-npm.test.ts.snap b/integration-tests/happy-path-npm/__snapshots__/happy-path-npm.test.ts.snap
index ee54e635..78e92b96 100644
--- a/integration-tests/happy-path-npm/__snapshots__/happy-path-npm.test.ts.snap
+++ b/integration-tests/happy-path-npm/__snapshots__/happy-path-npm.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test happy-path-npm: making patch 1`] = `
+exports[`Test happy-path-npm: 00: making patch 1`] = `
 "SNAPSHOT: making patch
 patch-package 0.0.0
 • Creating temporary folder
@@ -15,7 +15,7 @@ patch-package 0.0.0
 END SNAPSHOT"
 `;
 
-exports[`Test happy-path-npm: the patch looks like this 1`] = `
+exports[`Test happy-path-npm: 01: the patch looks like this 1`] = `
 "SNAPSHOT: the patch looks like this
 diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
 index 26f73ff..d4cc4af 100644
diff --git a/integration-tests/happy-path-yarn/__snapshots__/happy-path-yarn.test.ts.snap b/integration-tests/happy-path-yarn/__snapshots__/happy-path-yarn.test.ts.snap
index 0b22e347..0433eb56 100644
--- a/integration-tests/happy-path-yarn/__snapshots__/happy-path-yarn.test.ts.snap
+++ b/integration-tests/happy-path-yarn/__snapshots__/happy-path-yarn.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test happy-path-yarn: making patch 1`] = `
+exports[`Test happy-path-yarn: 00: making patch 1`] = `
 "SNAPSHOT: making patch
 patch-package 0.0.0
 • Creating temporary folder
@@ -15,7 +15,7 @@ patch-package 0.0.0
 END SNAPSHOT"
 `;
 
-exports[`Test happy-path-yarn: the patch looks like this 1`] = `
+exports[`Test happy-path-yarn: 01: the patch looks like this 1`] = `
 "SNAPSHOT: the patch looks like this
 diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
 index 26f73ff..b083802 100644
diff --git a/integration-tests/ignore-whitespace/__snapshots__/ignore-whitespace.test.ts.snap b/integration-tests/ignore-whitespace/__snapshots__/ignore-whitespace.test.ts.snap
index e5b5c464..1e9d3cde 100644
--- a/integration-tests/ignore-whitespace/__snapshots__/ignore-whitespace.test.ts.snap
+++ b/integration-tests/ignore-whitespace/__snapshots__/ignore-whitespace.test.ts.snap
@@ -1,13 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test ignore-whitespace: empty changeset when adding whitespace 1`] = `
+exports[`Test ignore-whitespace: 00: empty changeset when adding whitespace 1`] = `
 "SNAPSHOT: empty changeset when adding whitespace
+patch-package 0.0.0
+• Creating temporary folder
+• Installing alphabet@1.0.0 with yarn
+• Diffing your files with clean files
 ⁉️  Not creating patch file for package 'alphabet'
 ⁉️  There don't appear to be any changes.
 END SNAPSHOT"
 `;
 
-exports[`Test ignore-whitespace: line a changed 1`] = `
+exports[`Test ignore-whitespace: 01: line a changed 1`] = `
 "SNAPSHOT: line a changed
 diff --git a/node_modules/alphabet/index.js b/node_modules/alphabet/index.js
 index 7811d3b..454414b 100644
diff --git a/integration-tests/ignore-whitespace/ignore-whitespace.sh b/integration-tests/ignore-whitespace/ignore-whitespace.sh
index 106788cf..f380c447 100755
--- a/integration-tests/ignore-whitespace/ignore-whitespace.sh
+++ b/integration-tests/ignore-whitespace/ignore-whitespace.sh
@@ -9,12 +9,12 @@ echo "add random bits of whitespace"
 node add-whitespace.js
 
 echo "try to make patch file (should be empty)"
-(>&2 echo "SNAPSHOT: empty changeset when adding whitespace")
+echo "SNAPSHOT: empty changeset when adding whitespace"
 if patch-package alphabet
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "make a change to line a"
 node strip-whitespace.js
diff --git a/integration-tests/ignores-scripts-when-making-patch/__snapshots__/ignores-scripts-when-making-patch.test.ts.snap b/integration-tests/ignores-scripts-when-making-patch/__snapshots__/ignores-scripts-when-making-patch.test.ts.snap
index 1c31fe46..92a0a3e5 100644
--- a/integration-tests/ignores-scripts-when-making-patch/__snapshots__/ignores-scripts-when-making-patch.test.ts.snap
+++ b/integration-tests/ignores-scripts-when-making-patch/__snapshots__/ignores-scripts-when-making-patch.test.ts.snap
@@ -1,6 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test ignores-scripts-when-making-patch: a patch file got produced 1`] = `
+exports[`Test ignores-scripts-when-making-patch: 00: the patch creation output should look normal 1`] = `
+"SNAPSHOT: the patch creation output should look normal
+SNAPSHOT: there should be no stderr
+patch-package 0.0.0
+• Creating temporary folder
+• Installing naughty-package@1.0.0 with yarn
+• Diffing your files with clean files
+✔ Created file patches/naughty-package+1.0.0.patch
+
+END SNAPSHOT"
+`;
+
+exports[`Test ignores-scripts-when-making-patch: 01: a patch file got produced 1`] = `
 "SNAPSHOT: a patch file got produced
 diff --git a/node_modules/naughty-package/postinstall.sh b/node_modules/naughty-package/postinstall.sh
 index 3784520..c4af29c 100755
@@ -14,19 +26,3 @@ index 3784520..c4af29c 100755
  if ls ../patch-package ;
 END SNAPSHOT"
 `;
-
-exports[`Test ignores-scripts-when-making-patch: the patch creation output should look normal 1`] = `
-"SNAPSHOT: the patch creation output should look normal
-patch-package 0.0.0
-• Creating temporary folder
-• Installing naughty-package@1.0.0 with yarn
-• Diffing your files with clean files
-✔ Created file patches/naughty-package+1.0.0.patch
-
-END SNAPSHOT"
-`;
-
-exports[`Test ignores-scripts-when-making-patch: there should be no stderr 1`] = `
-"SNAPSHOT: there should be no stderr
-END SNAPSHOT"
-`;
diff --git a/integration-tests/ignores-scripts-when-making-patch/ignores-scripts-when-making-patch.sh b/integration-tests/ignores-scripts-when-making-patch/ignores-scripts-when-making-patch.sh
index 4f6fe336..4400ee03 100755
--- a/integration-tests/ignores-scripts-when-making-patch/ignores-scripts-when-making-patch.sh
+++ b/integration-tests/ignores-scripts-when-making-patch/ignores-scripts-when-making-patch.sh
@@ -8,10 +8,10 @@ alias patch-package=./node_modules/.bin/patch-package
 npx replace postinstall lol node_modules/naughty-package/postinstall.sh
 
 echo "SNAPSHOT: the patch creation output should look normal"
-(>&2 echo "SNAPSHOT: there should be no stderr")
+echo "SNAPSHOT: there should be no stderr"
 patch-package naughty-package
 echo "END SNAPSHOT"
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "SNAPSHOT: a patch file got produced"
 cat patches/naughty-package+1.0.0.patch
diff --git a/integration-tests/include-exclude-paths/__snapshots__/include-exclude-paths.test.ts.snap b/integration-tests/include-exclude-paths/__snapshots__/include-exclude-paths.test.ts.snap
index d9aeefa1..5aa40083 100644
--- a/integration-tests/include-exclude-paths/__snapshots__/include-exclude-paths.test.ts.snap
+++ b/integration-tests/include-exclude-paths/__snapshots__/include-exclude-paths.test.ts.snap
@@ -1,39 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test include-exclude-paths: exclude all but flip 1`] = `
-"SNAPSHOT: exclude all but flip
-diff --git a/node_modules/lodash/flip.js b/node_modules/lodash/flip.js
-index c28dd78..584b377 100644
---- a/node_modules/lodash/flip.js
-+++ b/node_modules/lodash/flip.js
-@@ -25,4 +25,4 @@ function flip(func) {
-   return createWrap(func, WRAP_FLIP_FLAG);
- }
- 
--module.exports = flip;
-+module.patchPackage = flip;
-END SNAPSHOT"
-`;
-
-exports[`Test include-exclude-paths: modified package.json 1`] = `
-"SNAPSHOT: modified package.json
-diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json
-index 028960d..7d346f3 100644
---- a/node_modules/lodash/package.json
-+++ b/node_modules/lodash/package.json
-@@ -1,7 +1,7 @@
- {
-   \\"name\\": \\"lodash\\",
-   \\"version\\": \\"4.17.4\\",
--  \\"description\\": \\"Lodash modular utilities.\\",
-+  \\"patchPackageRulezLol\\": \\"Lodash modular utilities.\\",
-   \\"keywords\\": \\"modules, stdlib, util\\",
-   \\"homepage\\": \\"https://lodash.com/\\",
-   \\"repository\\": \\"lodash/lodash\\",
+exports[`Test include-exclude-paths: 00: only __.js being deleted 1`] = `
+"SNAPSHOT: only __.js being deleted
+diff --git a/node_modules/lodash/fp/__.js b/node_modules/lodash/fp/__.js
+deleted file mode 100644
+index 4af98de..0000000
+--- a/node_modules/lodash/fp/__.js
++++ /dev/null
+@@ -1 +0,0 @@
+-module.exports = require('./placeholder');
 END SNAPSHOT"
 `;
 
-exports[`Test include-exclude-paths: no base files 1`] = `
+exports[`Test include-exclude-paths: 01: no base files 1`] = `
 "SNAPSHOT: no base files
 diff --git a/node_modules/lodash/flip.js b/node_modules/lodash/flip.js
 index c28dd78..584b377 100644
@@ -62,19 +41,7 @@ index 0000000..3b2aed8
 END SNAPSHOT"
 `;
 
-exports[`Test include-exclude-paths: only __.js being deleted 1`] = `
-"SNAPSHOT: only __.js being deleted
-diff --git a/node_modules/lodash/fp/__.js b/node_modules/lodash/fp/__.js
-deleted file mode 100644
-index 4af98de..0000000
---- a/node_modules/lodash/fp/__.js
-+++ /dev/null
-@@ -1 +0,0 @@
--module.exports = require('./placeholder');
-END SNAPSHOT"
-`;
-
-exports[`Test include-exclude-paths: only base files, no clone files 1`] = `
+exports[`Test include-exclude-paths: 02: only base files, no clone files 1`] = `
 "SNAPSHOT: only base files, no clone files
 diff --git a/node_modules/lodash/_baseClamp.js b/node_modules/lodash/_baseClamp.js
 index a1c5692..c52e38e 100644
@@ -88,3 +55,36 @@ index a1c5692..c52e38e 100644
 +module.patchPackage = baseClamp;
 END SNAPSHOT"
 `;
+
+exports[`Test include-exclude-paths: 03: exclude all but flip 1`] = `
+"SNAPSHOT: exclude all but flip
+diff --git a/node_modules/lodash/flip.js b/node_modules/lodash/flip.js
+index c28dd78..584b377 100644
+--- a/node_modules/lodash/flip.js
++++ b/node_modules/lodash/flip.js
+@@ -25,4 +25,4 @@ function flip(func) {
+   return createWrap(func, WRAP_FLIP_FLAG);
+ }
+ 
+-module.exports = flip;
++module.patchPackage = flip;
+END SNAPSHOT"
+`;
+
+exports[`Test include-exclude-paths: 04: modified package.json 1`] = `
+"SNAPSHOT: modified package.json
+diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json
+index 028960d..7d346f3 100644
+--- a/node_modules/lodash/package.json
++++ b/node_modules/lodash/package.json
+@@ -1,7 +1,7 @@
+ {
+   \\"name\\": \\"lodash\\",
+   \\"version\\": \\"4.17.4\\",
+-  \\"description\\": \\"Lodash modular utilities.\\",
++  \\"patchPackageRulezLol\\": \\"Lodash modular utilities.\\",
+   \\"keywords\\": \\"modules, stdlib, util\\",
+   \\"homepage\\": \\"https://lodash.com/\\",
+   \\"repository\\": \\"lodash/lodash\\",
+END SNAPSHOT"
+`;
diff --git a/integration-tests/lerna-canary/__snapshots__/lerna-canary.test.ts.snap b/integration-tests/lerna-canary/__snapshots__/lerna-canary.test.ts.snap
index 1dfdf267..eb1574e9 100644
--- a/integration-tests/lerna-canary/__snapshots__/lerna-canary.test.ts.snap
+++ b/integration-tests/lerna-canary/__snapshots__/lerna-canary.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test lerna-canary: making patch 1`] = `
+exports[`Test lerna-canary: 00: making patch 1`] = `
 "SNAPSHOT: making patch
 patch-package 0.0.0
 • Creating temporary folder
@@ -15,15 +15,7 @@ patch-package 0.0.0
 END SNAPSHOT"
 `;
 
-exports[`Test lerna-canary: the patch applies 1`] = `
-"SNAPSHOT: the patch applies
-patch-package 0.0.0
-Applying patches...
-@parcel/codeframe@2.0.0-nightly.137 ✔
-END SNAPSHOT"
-`;
-
-exports[`Test lerna-canary: the patch looks like this 1`] = `
+exports[`Test lerna-canary: 01: the patch looks like this 1`] = `
 "SNAPSHOT: the patch looks like this
 diff --git a/node_modules/@parcel/codeframe/src/codeframe.js b/node_modules/@parcel/codeframe/src/codeframe.js
 index 2bf2c1c..ef0695b 100644
@@ -40,3 +32,11 @@ index 2bf2c1c..ef0695b 100644
    // $FlowFixMe
 END SNAPSHOT"
 `;
+
+exports[`Test lerna-canary: 02: the patch applies 1`] = `
+"SNAPSHOT: the patch applies
+patch-package 0.0.0
+Applying patches...
+@parcel/codeframe@2.0.0-nightly.137 ✔
+END SNAPSHOT"
+`;
diff --git a/integration-tests/nested-packages/__snapshots__/nested-packages.test.ts.snap b/integration-tests/nested-packages/__snapshots__/nested-packages.test.ts.snap
index 420488cc..970c9429 100644
--- a/integration-tests/nested-packages/__snapshots__/nested-packages.test.ts.snap
+++ b/integration-tests/nested-packages/__snapshots__/nested-packages.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test nested-packages: create the patch 1`] = `
+exports[`Test nested-packages: 00: create the patch 1`] = `
 "SNAPSHOT: create the patch
 patch-package 0.0.0
 • Creating temporary folder
@@ -15,15 +15,7 @@ patch-package 0.0.0
 END SNAPSHOT"
 `;
 
-exports[`Test nested-packages: run patch-package 1`] = `
-"SNAPSHOT: run patch-package
-patch-package 0.0.0
-Applying patches...
-wrap-ansi/string-width@2.1.1 ✔
-END SNAPSHOT"
-`;
-
-exports[`Test nested-packages: the patch file contents 1`] = `
+exports[`Test nested-packages: 01: the patch file contents 1`] = `
 "SNAPSHOT: the patch file contents
 diff --git a/node_modules/wrap-ansi/node_modules/string-width/index.js b/node_modules/wrap-ansi/node_modules/string-width/index.js
 index bbc49d2..6407f49 100644
@@ -59,3 +51,11 @@ index bbc49d2..6407f49 100644
  };
 END SNAPSHOT"
 `;
+
+exports[`Test nested-packages: 02: run patch-package 1`] = `
+"SNAPSHOT: run patch-package
+patch-package 0.0.0
+Applying patches...
+wrap-ansi/string-width@2.1.1 ✔
+END SNAPSHOT"
+`;
diff --git a/integration-tests/nested-scoped-packages/__snapshots__/nested-scoped-packages.test.ts.snap b/integration-tests/nested-scoped-packages/__snapshots__/nested-scoped-packages.test.ts.snap
index f6566d46..0e61d1c5 100644
--- a/integration-tests/nested-scoped-packages/__snapshots__/nested-scoped-packages.test.ts.snap
+++ b/integration-tests/nested-scoped-packages/__snapshots__/nested-scoped-packages.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test nested-scoped-packages: create the patch 1`] = `
+exports[`Test nested-scoped-packages: 00: create the patch 1`] = `
 "SNAPSHOT: create the patch
 patch-package 0.0.0
 • Creating temporary folder
@@ -11,7 +11,7 @@ patch-package 0.0.0
 END SNAPSHOT"
 `;
 
-exports[`Test nested-scoped-packages: run patch-package 1`] = `
+exports[`Test nested-scoped-packages: 01: run patch-package 1`] = `
 "SNAPSHOT: run patch-package
 patch-package 0.0.0
 Applying patches...
diff --git a/integration-tests/newIntegrationTest.ts b/integration-tests/newIntegrationTest.ts
index 266f9b89..a88c9148 100644
--- a/integration-tests/newIntegrationTest.ts
+++ b/integration-tests/newIntegrationTest.ts
@@ -5,8 +5,8 @@ import { spawnSafeSync } from "../src/spawnSafe"
 const testName = process.argv[2]
 
 if (!testName || !testName.match(/[0-9a-zA-Z\-]+/)) {
-  console.error(`invalid name format '${testName}'`)
-  console.error("try something like this: blah-and-so-forth")
+  console.log(`invalid name format '${testName}'`)
+  console.log("try something like this: blah-and-so-forth")
 }
 
 console.log("making an integration test called", testName)
@@ -30,17 +30,23 @@ fs.writeFileSync(
 `,
 )
 
-spawnSafeSync("yarn", [], { cwd: testDir })
+spawnSafeSync("npm", ["i"], { cwd: testDir })
 
 // create shell script boilerplate
 fs.writeFileSync(
   path.join(testDir, `${testName}.sh`),
-  `# make sure errors stop the script
+  `#!/bin/bash
+# make sure errors stop the script
 set -e
 
+npm install
+
 echo "add patch-package"
-yarn add $1
-alias patch-package=./node_modules/.bin/patch-package
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
 `,
   { mode: 0o755 },
 )
diff --git a/integration-tests/no-symbolic-links/__snapshots__/no-symbolic-links.test.ts.snap b/integration-tests/no-symbolic-links/__snapshots__/no-symbolic-links.test.ts.snap
index b56f1d5a..d7e5b305 100644
--- a/integration-tests/no-symbolic-links/__snapshots__/no-symbolic-links.test.ts.snap
+++ b/integration-tests/no-symbolic-links/__snapshots__/no-symbolic-links.test.ts.snap
@@ -1,7 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test no-symbolic-links: patch-package fails to create a patch when there are symbolic links 1`] = `
+exports[`Test no-symbolic-links: 00: patch-package fails to create a patch when there are symbolic links 1`] = `
 "SNAPSHOT: patch-package fails to create a patch when there are symbolic links
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with yarn
+• Diffing your files with clean files
 
 ⛔️ ERROR
 
diff --git a/integration-tests/no-symbolic-links/no-symbolic-links.sh b/integration-tests/no-symbolic-links/no-symbolic-links.sh
index 5aa02c60..26b65940 100755
--- a/integration-tests/no-symbolic-links/no-symbolic-links.sh
+++ b/integration-tests/no-symbolic-links/no-symbolic-links.sh
@@ -8,9 +8,9 @@ alias patch-package=./node_modules/.bin/patch-package
 echo "make symbolic link"
 ln -s package.json node_modules/left-pad/package.parent.json
 
-(>&2 echo "SNAPSHOT: patch-package fails to create a patch when there are symbolic links")
+echo "SNAPSHOT: patch-package fails to create a patch when there are symbolic links"
 if patch-package left-pad
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
diff --git a/integration-tests/package-gets-updated/__snapshots__/package-gets-updated.test.ts.snap b/integration-tests/package-gets-updated/__snapshots__/package-gets-updated.test.ts.snap
index 062f88c9..d4b0f075 100644
--- a/integration-tests/package-gets-updated/__snapshots__/package-gets-updated.test.ts.snap
+++ b/integration-tests/package-gets-updated/__snapshots__/package-gets-updated.test.ts.snap
@@ -1,55 +1,27 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test package-gets-updated: fail when the patch was not applied 1`] = `
-"SNAPSHOT: fail when the patch was not applied
-warning left-pad@1.1.3: use String.prototype.padStart()
-
-**ERROR** Failed to apply patch for package left-pad at path
-  
-    node_modules/left-pad
-
-  This error was caused because left-pad has changed since you
-  made the patch file for it. This introduced conflicts with your patch,
-  just like a merge conflict in Git when separate incompatible changes are
-  made to the same piece of code.
-
-  Maybe this means your patch file is no longer necessary, in which case
-  hooray! Just delete it!
-
-  Otherwise, you need to generate a new patch file.
-
-  To generate a new one, just repeat the steps you made to generate the first
-  one.
-
-  i.e. manually make the appropriate file changes, then run 
-
-    patch-package left-pad
-
-  Info:
-    Patch file: patches/left-pad+1.1.1.patch
-    Patch was made for version: 1.1.1
-    Installed version: 1.1.3
-
----
-patch-package finished with 1 error(s).
-error Command failed with exit code 1.
-END SNAPSHOT"
-`;
-
-exports[`Test package-gets-updated: left-pad should contain patch-package 1`] = `
+exports[`Test package-gets-updated: 00: left-pad should contain patch-package 1`] = `
 "SNAPSHOT: left-pad should contain patch-package
     // devide \`len\` by 2, ditch the patch-package
 END SNAPSHOT"
 `;
 
-exports[`Test package-gets-updated: left-pad should still contain patch-package 1`] = `
-"SNAPSHOT: left-pad should still contain patch-package
-    // devide \`len\` by 2, ditch the patch-package
-END SNAPSHOT"
-`;
-
-exports[`Test package-gets-updated: warning when the patch was applied but version changed 1`] = `
+exports[`Test package-gets-updated: 01: warning when the patch was applied but version changed 1`] = `
 "SNAPSHOT: warning when the patch was applied but version changed
+[1/4] Resolving packages...
+[2/4] Fetching packages...
+[3/4] Linking dependencies...
+[4/4] Building fresh packages...
+success Saved lockfile.
+success Saved 1 new dependency.
+info Direct dependencies
+└─ patch-package@0.0.0
+info All dependencies
+└─ patch-package@0.0.0
+$ patch-package
+patch-package 0.0.0
+Applying patches...
+left-pad@1.1.1 ✔
 
 Warning: patch-package detected a patch file version mismatch
 
@@ -80,3 +52,57 @@ Warning: patch-package detected a patch file version mismatch
 patch-package finished with 1 warning(s).
 END SNAPSHOT"
 `;
+
+exports[`Test package-gets-updated: 02: left-pad should still contain patch-package 1`] = `
+"SNAPSHOT: left-pad should still contain patch-package
+    // devide \`len\` by 2, ditch the patch-package
+END SNAPSHOT"
+`;
+
+exports[`Test package-gets-updated: 03: fail when the patch was not applied 1`] = `
+"SNAPSHOT: fail when the patch was not applied
+[1/4] Resolving packages...
+[2/4] Fetching packages...
+[3/4] Linking dependencies...
+[4/4] Building fresh packages...
+success Saved lockfile.
+success Saved 1 new dependency.
+info Direct dependencies
+└─ left-pad@1.1.3
+info All dependencies
+└─ left-pad@1.1.3
+$ patch-package
+patch-package 0.0.0
+Applying patches...
+
+**ERROR** Failed to apply patch for package left-pad at path
+  
+    node_modules/left-pad
+
+  This error was caused because left-pad has changed since you
+  made the patch file for it. This introduced conflicts with your patch,
+  just like a merge conflict in Git when separate incompatible changes are
+  made to the same piece of code.
+
+  Maybe this means your patch file is no longer necessary, in which case
+  hooray! Just delete it!
+
+  Otherwise, you need to generate a new patch file.
+
+  To generate a new one, just repeat the steps you made to generate the first
+  one.
+
+  i.e. manually make the appropriate file changes, then run 
+
+    patch-package left-pad
+
+  Info:
+    Patch file: patches/left-pad+1.1.1.patch
+    Patch was made for version: 1.1.1
+    Installed version: 1.1.3
+
+---
+patch-package finished with 1 error(s).
+info Visit https://yarnpkg.com/en/docs/cli/add for documentation about this command.
+END SNAPSHOT"
+`;
diff --git a/integration-tests/package-gets-updated/package-gets-updated.sh b/integration-tests/package-gets-updated/package-gets-updated.sh
index 384f9f40..157873fe 100755
--- a/integration-tests/package-gets-updated/package-gets-updated.sh
+++ b/integration-tests/package-gets-updated/package-gets-updated.sh
@@ -9,19 +9,19 @@ echo "SNAPSHOT: left-pad should contain patch-package"
 grep patch-package node_modules/left-pad/index.js
 echo "END SNAPSHOT"
 
-(>&2 echo "SNAPSHOT: warning when the patch was applied but version changed")
+echo "SNAPSHOT: warning when the patch was applied but version changed"
 yarn add left-pad@1.1.2
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "SNAPSHOT: left-pad should still contain patch-package"
 grep patch-package node_modules/left-pad/index.js
 echo "END SNAPSHOT"
 
-(>&2 echo "SNAPSHOT: fail when the patch was not applied")
+echo "SNAPSHOT: fail when the patch was not applied"
 if yarn add left-pad@1.1.3 ; then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "left-pad should not contain patch-package"
 if grep patch-package node_modules/left-pad/index.js ; then
diff --git a/integration-tests/partial-apply/__snapshots__/partial-apply.test.ts.snap b/integration-tests/partial-apply/__snapshots__/partial-apply.test.ts.snap
new file mode 100644
index 00000000..1bc70f2f
--- /dev/null
+++ b/integration-tests/partial-apply/__snapshots__/partial-apply.test.ts.snap
@@ -0,0 +1,50 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test partial-apply: 00: patch-package fails when one of the patches in the sequence fails 1`] = `
+"SNAPSHOT: patch-package fails when one of the patches in the sequence fails
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (1 hello) ✔
+
+⛔ ERROR
+
+Failed to apply patch file left-pad+1.3.0+002+world.patch.
+
+If this patch file is no longer useful, delete it and run
+
+  patch-package
+
+To partially apply the patch (if possible) and output a log of errors to fix, run
+
+  patch-package --partial
+
+After which you should make any required changes inside node_modules/left-pad, and finally run
+
+  patch-package left-pad
+
+to update the patch file.
+
+END SNAPSHOT"
+`;
+
+exports[`Test partial-apply: 01: patch-package --partial saves a log 1`] = `
+"SNAPSHOT: patch-package --partial saves a log
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (1 hello) ✔
+Saving errors to ./patch-package-errors.log
+patch-package-errors.log
+Cannot apply hunk 0 for file node_modules/left-pad/index.js
+\`\`\`diff
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use oops';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
+\`\`\`
+END SNAPSHOT"
+`;
diff --git a/integration-tests/partial-apply/package-lock.json b/integration-tests/partial-apply/package-lock.json
new file mode 100644
index 00000000..07ac1d9c
--- /dev/null
+++ b/integration-tests/partial-apply/package-lock.json
@@ -0,0 +1,22 @@
+{
+  "name": "partial-apply",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "partial-apply",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "^1.3.0"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    }
+  }
+}
diff --git a/integration-tests/partial-apply/package.json b/integration-tests/partial-apply/package.json
new file mode 100644
index 00000000..3669abc8
--- /dev/null
+++ b/integration-tests/partial-apply/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "partial-apply",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "^1.3.0"
+  }
+}
diff --git a/integration-tests/partial-apply/partial-apply.sh b/integration-tests/partial-apply/partial-apply.sh
new file mode 100755
index 00000000..e9d5813f
--- /dev/null
+++ b/integration-tests/partial-apply/partial-apply.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# make sure errors stop the script
+set -e
+
+npm install
+
+echo "add patch-package"
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
+
+echo "SNAPSHOT: patch-package fails when one of the patches in the sequence fails"
+if patch-package
+then
+  exit 1
+fi
+echo "END SNAPSHOT"
+
+
+echo "SNAPSHOT: patch-package --partial saves a log"
+patch-package --partial
+echo 'patch-package-errors.log'
+cat patch-package-errors.log
+echo "END SNAPSHOT"
diff --git a/integration-tests/partial-apply/partial-apply.test.ts b/integration-tests/partial-apply/partial-apply.test.ts
new file mode 100644
index 00000000..e11f3275
--- /dev/null
+++ b/integration-tests/partial-apply/partial-apply.test.ts
@@ -0,0 +1,5 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({
+  projectName: "partial-apply",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/partial-apply/patches/left-pad+1.3.0+001+hello.patch b/integration-tests/partial-apply/patches/left-pad+1.3.0+001+hello.patch
new file mode 100644
index 00000000..a77d5b29
--- /dev/null
+++ b/integration-tests/partial-apply/patches/left-pad+1.3.0+001+hello.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/partial-apply/patches/left-pad+1.3.0+002+world.patch b/integration-tests/partial-apply/patches/left-pad+1.3.0+002+world.patch
new file mode 100644
index 00000000..ec3fcb32
--- /dev/null
+++ b/integration-tests/partial-apply/patches/left-pad+1.3.0+002+world.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..5aa41be 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use oops';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/partial-apply/patches/left-pad+1.3.0+003+goodbye.patch b/integration-tests/partial-apply/patches/left-pad+1.3.0+003+goodbye.patch
new file mode 100644
index 00000000..e7504c57
--- /dev/null
+++ b/integration-tests/partial-apply/patches/left-pad+1.3.0+003+goodbye.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..5ee751b 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use world';
++'goodbye world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/patch-parse-failure/__snapshots__/patch-parse-failure.test.ts.snap b/integration-tests/patch-parse-failure/__snapshots__/patch-parse-failure.test.ts.snap
index 3c1f0313..89c5f681 100644
--- a/integration-tests/patch-parse-failure/__snapshots__/patch-parse-failure.test.ts.snap
+++ b/integration-tests/patch-parse-failure/__snapshots__/patch-parse-failure.test.ts.snap
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test patch-parse-failure: patch parse failure message 1`] = `
+exports[`Test patch-parse-failure: 00: patch parse failure message 1`] = `
 "SNAPSHOT: patch parse failure message
+patch-package 0.0.0
+Applying patches...
 
 **ERROR** Failed to apply patch for package left-pad
     
diff --git a/integration-tests/patch-parse-failure/patch-parse-failure.sh b/integration-tests/patch-parse-failure/patch-parse-failure.sh
index 38b2e875..4200c778 100755
--- a/integration-tests/patch-parse-failure/patch-parse-failure.sh
+++ b/integration-tests/patch-parse-failure/patch-parse-failure.sh
@@ -5,8 +5,8 @@ echo "add patch-package"
 yarn add $1
 alias patch-package=./node_modules/.bin/patch-package
 
-(>&2 echo "SNAPSHOT: patch parse failure message")
+echo "SNAPSHOT: patch parse failure message"
 if patch-package; then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
diff --git a/integration-tests/rebase-fast-forward-failures/__snapshots__/rebase-fast-forward-failures.test.ts.snap b/integration-tests/rebase-fast-forward-failures/__snapshots__/rebase-fast-forward-failures.test.ts.snap
new file mode 100644
index 00000000..22de5de1
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/__snapshots__/rebase-fast-forward-failures.test.ts.snap
@@ -0,0 +1,87 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test rebase-fast-forward-failures: 00: when continuing the rebase, the final patch should fail to apply because it's out of date 1`] = `
+"SNAPSHOT: when continuing the rebase, the final patch should fail to apply because it's out of date
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with npm
+• Diffing your files with clean files
+✔ Created file patches/left-pad+1.3.0+002+world.patch
+
+Fast forwarding...
+
+⛔ ERROR
+
+Failed to apply patch file left-pad+1.3.0+003+goodbye.patch.
+
+If this patch file is no longer useful, delete it and run
+
+  patch-package
+
+To partially apply the patch (if possible) and output a log of errors to fix, run
+
+  patch-package --partial
+
+After which you should make any required changes inside node_modules/left-pad, and finally run
+
+  patch-package left-pad
+
+to update the patch file.
+
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-fast-forward-failures: 01: when continuing the rebase, the final patch should apply 1`] = `
+"SNAPSHOT: when continuing the rebase, the final patch should apply
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with npm
+• Diffing your files with clean files
+✔ Created file patches/left-pad+1.3.0+003+goodbye.patch
+
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-fast-forward-failures: 02: the patches should go from 'use strict' to 'use hello' to 'use universe' to 'goodbye universe' 1`] = `
+"SNAPSHOT: the patches should go from 'use strict' to 'use hello' to 'use universe' to 'goodbye universe'
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..f2e3912 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use universe';
+ module.exports = leftPad;
+ 
+ var cache = [
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index f2e3912..a02f494 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use universe';
++'goodbye universe';
+ module.exports = leftPad;
+ 
+ var cache = [
+END SNAPSHOT"
+`;
diff --git a/integration-tests/rebase-fast-forward-failures/package-lock.json b/integration-tests/rebase-fast-forward-failures/package-lock.json
new file mode 100644
index 00000000..4c085760
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/package-lock.json
@@ -0,0 +1,381 @@
+{
+  "name": "rebase-fast-forward-failures",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "rebase-fast-forward-failures",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "^1.3.0",
+        "replace": "^1.2.2"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/replace": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/replace/-/replace-1.2.2.tgz",
+      "integrity": "sha512-C4EDifm22XZM2b2JOYe6Mhn+lBsLBAvLbK8drfUQLTfD1KYl/n3VaW/CDju0Ny4w3xTtegBpg8YNSpFJPUDSjA==",
+      "dependencies": {
+        "chalk": "2.4.2",
+        "minimatch": "3.0.5",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "replace": "bin/replace.js",
+        "search": "bin/search.js"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}
diff --git a/integration-tests/rebase-fast-forward-failures/package.json b/integration-tests/rebase-fast-forward-failures/package.json
new file mode 100644
index 00000000..e3327093
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "rebase-fast-forward-failures",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "^1.3.0",
+    "replace": "^1.2.2"
+  }
+}
diff --git a/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+001+hello.patch b/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+001+hello.patch
new file mode 100644
index 00000000..a77d5b29
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+001+hello.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+002+world.patch b/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+002+world.patch
new file mode 100644
index 00000000..6ae65ba6
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+002+world.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..5aa41be 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+003+goodbye.patch b/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+003+goodbye.patch
new file mode 100644
index 00000000..e7504c57
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/patches/left-pad+1.3.0+003+goodbye.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..5ee751b 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use world';
++'goodbye world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-fast-forward-failures/rebase-fast-forward-failures.sh b/integration-tests/rebase-fast-forward-failures/rebase-fast-forward-failures.sh
new file mode 100755
index 00000000..243c76bd
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/rebase-fast-forward-failures.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# make sure errors stop the script
+set -e
+
+npm install
+
+echo "add patch-package"
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
+
+patch-package
+
+echo "rebase to the second patch"
+patch-package left-pad --rebase patches/*002+world.patch
+
+echo "replace world with universe"
+./node_modules/.bin/replace 'world' 'universe' node_modules/left-pad/index.js
+
+echo "SNAPSHOT: when continuing the rebase, the final patch should fail to apply because it's out of date"
+patch-package left-pad
+echo "END SNAPSHOT"
+
+echo "replace 'use universe' with 'goodbye universe' manually"
+./node_modules/.bin/replace 'use universe' 'goodbye universe' node_modules/left-pad/index.js
+
+echo "SNAPSHOT: when continuing the rebase, the final patch should apply"
+patch-package left-pad
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: the patches should go from 'use strict' to 'use hello' to 'use universe' to 'goodbye universe'" 
+cat patches/*
+echo "END SNAPSHOT"
diff --git a/integration-tests/rebase-fast-forward-failures/rebase-fast-forward-failures.test.ts b/integration-tests/rebase-fast-forward-failures/rebase-fast-forward-failures.test.ts
new file mode 100644
index 00000000..d82a0654
--- /dev/null
+++ b/integration-tests/rebase-fast-forward-failures/rebase-fast-forward-failures.test.ts
@@ -0,0 +1,5 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({
+  projectName: "rebase-fast-forward-failures",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/rebase-insert/__snapshots__/rebase-insert.test.ts.snap b/integration-tests/rebase-insert/__snapshots__/rebase-insert.test.ts.snap
new file mode 100644
index 00000000..e923dcf8
--- /dev/null
+++ b/integration-tests/rebase-insert/__snapshots__/rebase-insert.test.ts.snap
@@ -0,0 +1,105 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test rebase-insert: 00: Rebase to the second patch 1`] = `
+"SNAPSHOT: Rebase to the second patch
+patch-package 0.0.0
+Un-applied left-pad+1.3.0+003+goodbye.patch
+
+Make any changes you need inside node_modules/left-pad
+
+When you are done, do one of the following:
+
+  To update left-pad+1.3.0+002+world.patch run
+
+    patch-package left-pad
+    
+  To create a new patch file after left-pad+1.3.0+002+world.patch run
+  
+    patch-package left-pad --append 'MyChangeDescription'
+
+  
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-insert: 01: the state file should show two patches applied and isRebasing: true 1`] = `
+"SNAPSHOT: the state file should show two patches applied and isRebasing: true
+{
+    \\"isRebasing\\": true,
+    \\"patches\\": [
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"404c604ed830db6a0605f86cb9165ced136848f70986b23bf877bcf38968c1c9\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+001+hello.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"f2859c7193de8d9578bdde7e226de516adc8d972d6e76997cbe1f41b1a535359\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+002+world.patch\\"
+        }
+    ],
+    \\"version\\": 1
+}END SNAPSHOT"
+`;
+
+exports[`Test rebase-insert: 02: insert a patch in the sequence and fast forward to the end 1`] = `
+"SNAPSHOT: insert a patch in the sequence and fast forward to the end
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with npm
+• Diffing your files with clean files
+Renaming left-pad+1.3.0+003+goodbye.patch to left-pad+1.3.0+004+goodbye.patch
+✔ Created file patches/left-pad+1.3.0+003+some-stuff.patch
+
+Fast forwarding...
+  ✔ left-pad+1.3.0+004+goodbye.patch
+ls patches
+left-pad+1.3.0+001+hello.patch
+left-pad+1.3.0+002+world.patch
+left-pad+1.3.0+003+some-stuff.patch
+left-pad+1.3.0+004+goodbye.patch
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-insert: 03: the state file should show three patches applied and isRebasing: false 1`] = `
+"SNAPSHOT: the state file should show three patches applied and isRebasing: false
+{
+    \\"isRebasing\\": false,
+    \\"patches\\": [
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"404c604ed830db6a0605f86cb9165ced136848f70986b23bf877bcf38968c1c9\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+001+hello.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"f2859c7193de8d9578bdde7e226de516adc8d972d6e76997cbe1f41b1a535359\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+002+world.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"bcfdda02dae96c0ebc805877bf6497cc77ba50c1f1a84b9dab9c2b9ffcfa6fbe\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+003+some-stuff.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"c9063ed6ae00867ee243fa71590c369ce0bb699f3a63a10df86d3ec988782715\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+004+goodbye.patch\\"
+        }
+    ],
+    \\"version\\": 1
+}END SNAPSHOT"
+`;
+
+exports[`Test rebase-insert: 04: The patch file created only shows the new bits 1`] = `
+"SNAPSHOT: The patch file created only shows the new bits
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..8b88742 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -50,3 +50,4 @@ function leftPad (str, len, ch) {
+   // pad \`str\`!
+   return pad + str;
+ }
++'some stuff'
+END SNAPSHOT"
+`;
diff --git a/integration-tests/rebase-insert/package-lock.json b/integration-tests/rebase-insert/package-lock.json
new file mode 100644
index 00000000..e07f469b
--- /dev/null
+++ b/integration-tests/rebase-insert/package-lock.json
@@ -0,0 +1,22 @@
+{
+  "name": "rebase-insert",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "rebase-insert",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "^1.3.0"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    }
+  }
+}
diff --git a/integration-tests/rebase-insert/package.json b/integration-tests/rebase-insert/package.json
new file mode 100644
index 00000000..4b0f4060
--- /dev/null
+++ b/integration-tests/rebase-insert/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "rebase-insert",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "^1.3.0"
+  }
+}
diff --git a/integration-tests/rebase-insert/patches/left-pad+1.3.0+001+hello.patch b/integration-tests/rebase-insert/patches/left-pad+1.3.0+001+hello.patch
new file mode 100644
index 00000000..a77d5b29
--- /dev/null
+++ b/integration-tests/rebase-insert/patches/left-pad+1.3.0+001+hello.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-insert/patches/left-pad+1.3.0+002+world.patch b/integration-tests/rebase-insert/patches/left-pad+1.3.0+002+world.patch
new file mode 100644
index 00000000..6ae65ba6
--- /dev/null
+++ b/integration-tests/rebase-insert/patches/left-pad+1.3.0+002+world.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..5aa41be 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-insert/patches/left-pad+1.3.0+003+goodbye.patch b/integration-tests/rebase-insert/patches/left-pad+1.3.0+003+goodbye.patch
new file mode 100644
index 00000000..e7504c57
--- /dev/null
+++ b/integration-tests/rebase-insert/patches/left-pad+1.3.0+003+goodbye.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..5ee751b 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use world';
++'goodbye world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-insert/rebase-insert.sh b/integration-tests/rebase-insert/rebase-insert.sh
new file mode 100755
index 00000000..d2d3c8c7
--- /dev/null
+++ b/integration-tests/rebase-insert/rebase-insert.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# make sure errors stop the script
+set -ea
+
+npm install
+
+echo "add patch-package"
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
+
+echo "apply the patches"
+patch-package
+
+
+echo "SNAPSHOT: Rebase to the second patch"
+patch-package left-pad --rebase patches/*002+world.patch
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: the state file should show two patches applied and isRebasing: true"
+cat node_modules/left-pad/.patch-package.json
+echo "END SNAPSHOT"
+
+echo "add some stuff later in the file"
+echo "'some stuff'" >> node_modules/left-pad/index.js
+
+echo "SNAPSHOT: insert a patch in the sequence and fast forward to the end"
+patch-package left-pad --append 'some-stuff'
+echo "ls patches"
+ls patches
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: the state file should show three patches applied and isRebasing: false" 
+cat node_modules/left-pad/.patch-package.json
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: The patch file created only shows the new bits"
+cat patches/*some-stuff.patch
+echo "END SNAPSHOT"
diff --git a/integration-tests/rebase-insert/rebase-insert.test.ts b/integration-tests/rebase-insert/rebase-insert.test.ts
new file mode 100644
index 00000000..afc67109
--- /dev/null
+++ b/integration-tests/rebase-insert/rebase-insert.test.ts
@@ -0,0 +1,5 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({
+  projectName: "rebase-insert",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/rebase-update/__snapshots__/rebase-update.test.ts.snap b/integration-tests/rebase-update/__snapshots__/rebase-update.test.ts.snap
new file mode 100644
index 00000000..fa0346e1
--- /dev/null
+++ b/integration-tests/rebase-update/__snapshots__/rebase-update.test.ts.snap
@@ -0,0 +1,66 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test rebase-update: 00: update the second patch and fast forward to the end 1`] = `
+"SNAPSHOT: update the second patch and fast forward to the end
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with npm
+• Diffing your files with clean files
+✔ Created file patches/left-pad+1.3.0+002+world.patch
+
+Fast forwarding...
+  ✔ left-pad+1.3.0+003+goodbye.patch
+ls patches
+left-pad+1.3.0+001+hello.patch
+left-pad+1.3.0+002+world.patch
+left-pad+1.3.0+003+goodbye.patch
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-update: 01: the state file should show three patches applied and isRebasing: false 1`] = `
+"SNAPSHOT: the state file should show three patches applied and isRebasing: false
+{
+    \\"isRebasing\\": false,
+    \\"patches\\": [
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"404c604ed830db6a0605f86cb9165ced136848f70986b23bf877bcf38968c1c9\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+001+hello.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"62e558409525a1e09ede02c3ec23a6ce784ba23ce62b813a9b5db44b0a10ea18\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+002+world.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"c9063ed6ae00867ee243fa71590c369ce0bb699f3a63a10df86d3ec988782715\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+003+goodbye.patch\\"
+        }
+    ],
+    \\"version\\": 1
+}END SNAPSHOT"
+`;
+
+exports[`Test rebase-update: 02: The patch file was updated with the new bits 1`] = `
+"SNAPSHOT: The patch file was updated with the new bits
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..8b88742 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
+@@ -50,3 +50,4 @@ function leftPad (str, len, ch) {
+   // pad \`str\`!
+   return pad + str;
+ }
++'some stuff'
+END SNAPSHOT"
+`;
diff --git a/integration-tests/rebase-update/package-lock.json b/integration-tests/rebase-update/package-lock.json
new file mode 100644
index 00000000..f10f101a
--- /dev/null
+++ b/integration-tests/rebase-update/package-lock.json
@@ -0,0 +1,22 @@
+{
+  "name": "rebase-update",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "rebase-update",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "^1.3.0"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    }
+  }
+}
diff --git a/integration-tests/rebase-update/package.json b/integration-tests/rebase-update/package.json
new file mode 100644
index 00000000..331bb6f0
--- /dev/null
+++ b/integration-tests/rebase-update/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "rebase-update",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "^1.3.0"
+  }
+}
diff --git a/integration-tests/rebase-update/patches/left-pad+1.3.0+001+hello.patch b/integration-tests/rebase-update/patches/left-pad+1.3.0+001+hello.patch
new file mode 100644
index 00000000..a77d5b29
--- /dev/null
+++ b/integration-tests/rebase-update/patches/left-pad+1.3.0+001+hello.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-update/patches/left-pad+1.3.0+002+world.patch b/integration-tests/rebase-update/patches/left-pad+1.3.0+002+world.patch
new file mode 100644
index 00000000..6ae65ba6
--- /dev/null
+++ b/integration-tests/rebase-update/patches/left-pad+1.3.0+002+world.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..5aa41be 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-update/patches/left-pad+1.3.0+003+goodbye.patch b/integration-tests/rebase-update/patches/left-pad+1.3.0+003+goodbye.patch
new file mode 100644
index 00000000..e7504c57
--- /dev/null
+++ b/integration-tests/rebase-update/patches/left-pad+1.3.0+003+goodbye.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..5ee751b 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use world';
++'goodbye world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-update/rebase-update.sh b/integration-tests/rebase-update/rebase-update.sh
new file mode 100755
index 00000000..66cd52d1
--- /dev/null
+++ b/integration-tests/rebase-update/rebase-update.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# make sure errors stop the script
+set -e
+
+npm install
+
+echo "add patch-package"
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
+
+echo "apply the patches"
+patch-package
+
+echo "rebase to the second patch"
+patch-package left-pad --rebase patches/*002+world.patch
+
+echo "add some stuff later in the file"
+echo "'some stuff'" >> node_modules/left-pad/index.js
+
+echo "SNAPSHOT: update the second patch and fast forward to the end"
+patch-package left-pad
+echo "ls patches"
+ls patches
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: the state file should show three patches applied and isRebasing: false" 
+cat node_modules/left-pad/.patch-package.json
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: The patch file was updated with the new bits"
+cat patches/*world.patch
+echo "END SNAPSHOT"
diff --git a/integration-tests/rebase-update/rebase-update.test.ts b/integration-tests/rebase-update/rebase-update.test.ts
new file mode 100644
index 00000000..93f77a03
--- /dev/null
+++ b/integration-tests/rebase-update/rebase-update.test.ts
@@ -0,0 +1,5 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({
+  projectName: "rebase-update",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/rebase-zero/__snapshots__/rebase-zero.test.ts.snap b/integration-tests/rebase-zero/__snapshots__/rebase-zero.test.ts.snap
new file mode 100644
index 00000000..da8038ec
--- /dev/null
+++ b/integration-tests/rebase-zero/__snapshots__/rebase-zero.test.ts.snap
@@ -0,0 +1,164 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test rebase-zero: 00: rebase to zero 1`] = `
+"SNAPSHOT: rebase to zero
+patch-package 0.0.0
+Un-applied left-pad+1.3.0+003+goodbye.patch
+Un-applied left-pad+1.3.0+002+world.patch
+Un-applied left-pad+1.3.0+001+hello.patch
+
+Make any changes you need inside node_modules/left-pad
+
+When you are done, run
+
+  patch-package left-pad --append 'MyChangeDescription'
+  
+to insert a new patch file.
+
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-zero: 01: it creates a new patch at the start and renames all the other patches, applying them 1`] = `
+"SNAPSHOT: it creates a new patch at the start and renames all the other patches, applying them
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with npm
+• Diffing your files with clean files
+Renaming left-pad+1.3.0+001+hello.patch to left-pad+1.3.0+002+hello.patch
+Renaming left-pad+1.3.0+002+world.patch to left-pad+1.3.0+003+world.patch
+Renaming left-pad+1.3.0+003+goodbye.patch to left-pad+1.3.0+004+goodbye.patch
+✔ Created file patches/left-pad+1.3.0+001+WhileOne.patch
+
+Fast forwarding...
+  ✔ left-pad+1.3.0+002+hello.patch
+  ✔ left-pad+1.3.0+003+world.patch
+  ✔ left-pad+1.3.0+004+goodbye.patch
+left-pad+1.3.0+001+WhileOne.patch
+left-pad+1.3.0+002+hello.patch
+left-pad+1.3.0+003+world.patch
+left-pad+1.3.0+004+goodbye.patch
+the state file
+{
+    \\"isRebasing\\": false,
+    \\"patches\\": [
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"dfc6e6951dc7d5bf2e1768a353933c73ba6bccd76c7927d28384107f3be2e8eb\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+001+WhileOne.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"404c604ed830db6a0605f86cb9165ced136848f70986b23bf877bcf38968c1c9\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+002+hello.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"f2859c7193de8d9578bdde7e226de516adc8d972d6e76997cbe1f41b1a535359\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+003+world.patch\\"
+        },
+        {
+            \\"didApply\\": true,
+            \\"patchContentHash\\": \\"c9063ed6ae00867ee243fa71590c369ce0bb699f3a63a10df86d3ec988782715\\",
+            \\"patchFilename\\": \\"left-pad+1.3.0+004+goodbye.patch\\"
+        }
+    ],
+    \\"version\\": 1
+}the js file
+/* This program is free software. It comes without any warranty, to
+     * the extent permitted by applicable law. You can redistribute it
+     * and/or modify it under the terms of the Do What The Fuck You Want
+     * To Public License, Version 2, as published by Sam Hocevar. See
+     * http://www.wtfpl.net/ for more details. */
+'goodbye world';
+module.exports = leftPad;
+
+var cache = [
+  '',
+  ' ',
+  '  ',
+  '   ',
+  '    ',
+  '     ',
+  '      ',
+  '       ',
+  '        ',
+  '         '
+];
+
+function leftPad (str, len, ch) {
+  // convert \`str\` to a \`string\`
+  str = str + '';
+  // \`len\` is the \`pad\`'s length now
+  len = len - str.length;
+  // doesn't need to pad
+  if (len <= 0) return str;
+  // \`ch\` defaults to \`' '\`
+  if (!ch && ch !== 0) ch = ' ';
+  // convert \`ch\` to a \`string\` cuz it could be a number
+  ch = ch + '';
+  // cache common use cases
+  if (ch === ' ' && len < 10) return cache[len] + str;
+  // \`pad\` starts with an empty string
+  var pad = '';
+  // loop
+  while (1) {
+    // add \`ch\` to \`pad\` if \`len\` is odd
+    if (len & 1) pad += ch;
+    // divide \`len\` by 2, ditch the remainder
+    len >>= 1;
+    // \\"double\\" the \`ch\` so this operation count grows logarithmically on \`len\`
+    // each time \`ch\` is \\"doubled\\", the \`len\` would need to be \\"doubled\\" too
+    // similar to finding a value in binary search tree, hence O(log(n))
+    if (len) ch += ch;
+    // \`len\` is 0, exit the loop
+    else break;
+  }
+  // pad \`str\`!
+  return pad + str;
+}
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-zero: 02: rebase to zero again 1`] = `
+"SNAPSHOT: rebase to zero again
+patch-package 0.0.0
+Un-applied left-pad+1.3.0+004+goodbye.patch
+Un-applied left-pad+1.3.0+003+world.patch
+Un-applied left-pad+1.3.0+002+hello.patch
+Un-applied left-pad+1.3.0+001+WhileOne.patch
+
+Make any changes you need inside node_modules/left-pad
+
+When you are done, run
+
+  patch-package left-pad --append 'MyChangeDescription'
+  
+to insert a new patch file.
+
+END SNAPSHOT"
+`;
+
+exports[`Test rebase-zero: 03: it creates a new patch at the start called 'initial' if you dont do --append 1`] = `
+"SNAPSHOT: it creates a new patch at the start called 'initial' if you dont do --append
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with npm
+• Diffing your files with clean files
+Renaming left-pad+1.3.0+001+WhileOne.patch to left-pad+1.3.0+002+WhileOne.patch
+Renaming left-pad+1.3.0+002+hello.patch to left-pad+1.3.0+003+hello.patch
+Renaming left-pad+1.3.0+003+world.patch to left-pad+1.3.0+004+world.patch
+Renaming left-pad+1.3.0+004+goodbye.patch to left-pad+1.3.0+005+goodbye.patch
+✔ Created file patches/left-pad+1.3.0+001+initial.patch
+
+Fast forwarding...
+  ✔ left-pad+1.3.0+002+WhileOne.patch
+  ✔ left-pad+1.3.0+003+hello.patch
+  ✔ left-pad+1.3.0+004+world.patch
+  ✔ left-pad+1.3.0+005+goodbye.patch
+left-pad+1.3.0+001+initial.patch
+left-pad+1.3.0+002+WhileOne.patch
+left-pad+1.3.0+003+hello.patch
+left-pad+1.3.0+004+world.patch
+left-pad+1.3.0+005+goodbye.patch
+END SNAPSHOT"
+`;
diff --git a/integration-tests/rebase-zero/package-lock.json b/integration-tests/rebase-zero/package-lock.json
new file mode 100644
index 00000000..1c2c223d
--- /dev/null
+++ b/integration-tests/rebase-zero/package-lock.json
@@ -0,0 +1,381 @@
+{
+  "name": "rebase-zero",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "rebase-zero",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "^1.3.0",
+        "replace": "^1.2.2"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/replace": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/replace/-/replace-1.2.2.tgz",
+      "integrity": "sha512-C4EDifm22XZM2b2JOYe6Mhn+lBsLBAvLbK8drfUQLTfD1KYl/n3VaW/CDju0Ny4w3xTtegBpg8YNSpFJPUDSjA==",
+      "dependencies": {
+        "chalk": "2.4.2",
+        "minimatch": "3.0.5",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "replace": "bin/replace.js",
+        "search": "bin/search.js"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}
diff --git a/integration-tests/rebase-zero/package.json b/integration-tests/rebase-zero/package.json
new file mode 100644
index 00000000..9e8a7b88
--- /dev/null
+++ b/integration-tests/rebase-zero/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "rebase-zero",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "^1.3.0",
+    "replace": "^1.2.2"
+  }
+}
diff --git a/integration-tests/rebase-zero/patches/left-pad+1.3.0+001+hello.patch b/integration-tests/rebase-zero/patches/left-pad+1.3.0+001+hello.patch
new file mode 100644
index 00000000..a77d5b29
--- /dev/null
+++ b/integration-tests/rebase-zero/patches/left-pad+1.3.0+001+hello.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-zero/patches/left-pad+1.3.0+002+world.patch b/integration-tests/rebase-zero/patches/left-pad+1.3.0+002+world.patch
new file mode 100644
index 00000000..6ae65ba6
--- /dev/null
+++ b/integration-tests/rebase-zero/patches/left-pad+1.3.0+002+world.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..5aa41be 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-zero/patches/left-pad+1.3.0+003+goodbye.patch b/integration-tests/rebase-zero/patches/left-pad+1.3.0+003+goodbye.patch
new file mode 100644
index 00000000..e7504c57
--- /dev/null
+++ b/integration-tests/rebase-zero/patches/left-pad+1.3.0+003+goodbye.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..5ee751b 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use world';
++'goodbye world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/rebase-zero/rebase-zero.sh b/integration-tests/rebase-zero/rebase-zero.sh
new file mode 100755
index 00000000..8c26bcb5
--- /dev/null
+++ b/integration-tests/rebase-zero/rebase-zero.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# make sure errors stop the script
+set -e
+
+npm install
+
+echo "add patch-package"
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
+
+patch-package
+
+echo "SNAPSHOT: rebase to zero"
+patch-package left-pad --rebase 0
+echo "END SNAPSHOT"
+
+echo "replace while (true) with while (1)"
+./node_modules/.bin/replace 'while \(true\)' 'while (1)' node_modules/left-pad/index.js
+
+echo "SNAPSHOT: it creates a new patch at the start and renames all the other patches, applying them"
+patch-package left-pad --append 'WhileOne'
+ls patches
+echo "the state file"
+cat node_modules/left-pad/.patch-package.json
+echo "the js file"
+cat node_modules/left-pad/index.js
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: rebase to zero again"
+patch-package left-pad --rebase 0
+echo "END SNAPSHOT"
+
+echo "replace function with const"
+./node_modules/.bin/replace 'function leftPad' 'const leftPad = function' node_modules/left-pad/index.js
+
+echo "SNAPSHOT: it creates a new patch at the start called 'initial' if you dont do --append"
+patch-package left-pad 
+ls patches
+echo "END SNAPSHOT"
\ No newline at end of file
diff --git a/integration-tests/rebase-zero/rebase-zero.test.ts b/integration-tests/rebase-zero/rebase-zero.test.ts
new file mode 100644
index 00000000..99c5aaad
--- /dev/null
+++ b/integration-tests/rebase-zero/rebase-zero.test.ts
@@ -0,0 +1,2 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({ projectName: "rebase-zero", shouldProduceSnapshots: true })
diff --git a/integration-tests/reverse-multiple-patches/__snapshots__/reverse-multiple-patches.test.ts.snap b/integration-tests/reverse-multiple-patches/__snapshots__/reverse-multiple-patches.test.ts.snap
new file mode 100644
index 00000000..e1ce3022
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/__snapshots__/reverse-multiple-patches.test.ts.snap
@@ -0,0 +1,64 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test reverse-multiple-patches: 00: the patches were applied 1`] = `
+"SNAPSHOT: the patches were applied
+'goodbye world';
+END SNAPSHOT"
+`;
+
+exports[`Test reverse-multiple-patches: 01: --reverse undoes the patches 1`] = `
+"SNAPSHOT: --reverse undoes the patches
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (3 goodbye) ✔
+left-pad@1.3.0 (2 world) ✔
+left-pad@1.3.0 (1 hello) ✔
+END SNAPSHOT"
+`;
+
+exports[`Test reverse-multiple-patches: 02: The patches can be reapplied 1`] = `
+"SNAPSHOT: The patches can be reapplied
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (1 hello) ✔
+left-pad@1.3.0 (2 world) ✔
+left-pad@1.3.0 (3 goodbye) ✔
+END SNAPSHOT"
+`;
+
+exports[`Test reverse-multiple-patches: 03: if one of the patches fails then reverse only undoes the ones that succeeded 1`] = `
+"SNAPSHOT: if one of the patches fails then reverse only undoes the ones that succeeded
+patches/left-pad+1.3.0+003+goodbye.patch
+ 9: -'use schmorld';
+ 10: +'goodbye schmorld';
+apply broken
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (1 hello) ✔
+left-pad@1.3.0 (2 world) ✔
+
+⛔ ERROR
+
+Failed to apply patch file left-pad+1.3.0+003+goodbye.patch.
+
+If this patch file is no longer useful, delete it and run
+
+  patch-package
+
+To partially apply the patch (if possible) and output a log of errors to fix, run
+
+  patch-package --partial
+
+After which you should make any required changes inside node_modules/left-pad, and finally run
+
+  patch-package left-pad
+
+to update the patch file.
+
+reverse all but broken
+patch-package 0.0.0
+Applying patches...
+left-pad@1.3.0 (2 world) ✔
+left-pad@1.3.0 (1 hello) ✔
+END SNAPSHOT"
+`;
diff --git a/integration-tests/reverse-multiple-patches/package-lock.json b/integration-tests/reverse-multiple-patches/package-lock.json
new file mode 100644
index 00000000..11934a5f
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/package-lock.json
@@ -0,0 +1,381 @@
+{
+  "name": "reverse-multiple-patches",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "reverse-multiple-patches",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "left-pad": "1.3.0",
+        "replace": "^1.2.2"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/replace": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/replace/-/replace-1.2.2.tgz",
+      "integrity": "sha512-C4EDifm22XZM2b2JOYe6Mhn+lBsLBAvLbK8drfUQLTfD1KYl/n3VaW/CDju0Ny4w3xTtegBpg8YNSpFJPUDSjA==",
+      "dependencies": {
+        "chalk": "2.4.2",
+        "minimatch": "3.0.5",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "replace": "bin/replace.js",
+        "search": "bin/search.js"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}
diff --git a/integration-tests/reverse-multiple-patches/package.json b/integration-tests/reverse-multiple-patches/package.json
new file mode 100644
index 00000000..69870d2b
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "reverse-multiple-patches",
+  "version": "1.0.0",
+  "description": "integration test for patch-package",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "left-pad": "1.3.0",
+    "replace": "^1.2.2"
+  }
+}
diff --git a/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+001+hello.patch b/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+001+hello.patch
new file mode 100644
index 00000000..a77d5b29
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+001+hello.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index e90aec3..1a2ec5f 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use strict';
++'use hello';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+002+world.patch b/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+002+world.patch
new file mode 100644
index 00000000..6ae65ba6
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+002+world.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 1a2ec5f..5aa41be 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use hello';
++'use world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+003+goodbye.patch b/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+003+goodbye.patch
new file mode 100644
index 00000000..cd6a650e
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/patches/left-pad+1.3.0+003+goodbye.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index 5aa41be..2beca7e 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -3,7 +3,7 @@
+      * and/or modify it under the terms of the Do What The Fuck You Want
+      * To Public License, Version 2, as published by Sam Hocevar. See
+      * http://www.wtfpl.net/ for more details. */
+-'use world';
++'goodbye world';
+ module.exports = leftPad;
+ 
+ var cache = [
diff --git a/integration-tests/reverse-multiple-patches/reverse-multiple-patches.sh b/integration-tests/reverse-multiple-patches/reverse-multiple-patches.sh
new file mode 100755
index 00000000..8d863cc4
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/reverse-multiple-patches.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# make sure errors stop the script
+set -e
+
+npm install
+
+echo "add patch-package"
+npm add $1
+
+function patch-package {
+  ./node_modules/.bin/patch-package "$@"
+}
+
+echo "applicaiton works (tested elsewhere)"
+patch-package
+
+echo "SNAPSHOT: the patches were applied"
+grep goodbye node_modules/left-pad/index.js
+echo "END SNAPSHOT"
+
+echo "SNAPSHOT: --reverse undoes the patches"
+patch-package --reverse
+echo "END SNAPSHOT"
+
+if grep goodbye node_modules/left-pad/index.js; then
+  echo "ERROR: patches were not reversed"
+  exit 1
+fi
+
+echo "SNAPSHOT: The patches can be reapplied"
+patch-package
+echo "END SNAPSHOT"
+
+patch-package --reverse
+
+echo "SNAPSHOT: if one of the patches fails then reverse only undoes the ones that succeeded"
+./node_modules/.bin/replace world schmorld patches/*+goodbye.patch
+echo "apply broken"
+if patch-package; then
+  exit 1
+fi
+echo "reverse all but broken"
+patch-package --reverse
+echo "END SNAPSHOT"
diff --git a/integration-tests/reverse-multiple-patches/reverse-multiple-patches.test.ts b/integration-tests/reverse-multiple-patches/reverse-multiple-patches.test.ts
new file mode 100644
index 00000000..ac97534f
--- /dev/null
+++ b/integration-tests/reverse-multiple-patches/reverse-multiple-patches.test.ts
@@ -0,0 +1,5 @@
+import { runIntegrationTest } from "../runIntegrationTest"
+runIntegrationTest({
+  projectName: "reverse-multiple-patches",
+  shouldProduceSnapshots: true,
+})
diff --git a/integration-tests/runIntegrationTest.ts b/integration-tests/runIntegrationTest.ts
index 7708a450..e0d857ee 100644
--- a/integration-tests/runIntegrationTest.ts
+++ b/integration-tests/runIntegrationTest.ts
@@ -3,6 +3,7 @@ import { join, resolve } from "../src/path"
 import * as tmp from "tmp"
 import { spawnSafeSync } from "../src/spawnSafe"
 import { resolveRelativeFileDependencies } from "../src/resolveRelativeFileDependencies"
+import rimraf from "rimraf"
 
 export const patchPackageTarballPath = resolve(
   fs
@@ -23,6 +24,9 @@ export function runIntegrationTest({
       recursive: true,
     })
 
+    // remove node_modules folder when running locally, to avoid leaking state from source dir
+    rimraf.sync(join(tmpDir.name, "node_modules"))
+
     const packageJson = require(join(tmpDir.name, "package.json"))
     packageJson.dependencies = resolveRelativeFileDependencies(
       join(__dirname, projectName),
@@ -55,7 +59,7 @@ export function runIntegrationTest({
     const output = result.stdout.toString() + "\n" + result.stderr.toString()
 
     if (result.status !== 0) {
-      console.error(output)
+      console.log(output)
     }
 
     it("should produce output", () => {
@@ -69,12 +73,16 @@ export function runIntegrationTest({
         expect(snapshots && snapshots.length).toBeTruthy()
       })
       if (snapshots) {
-        snapshots.forEach((snapshot) => {
+        snapshots.forEach((snapshot, i) => {
           const snapshotDescriptionMatch = snapshot.match(/SNAPSHOT: (.*)/)
           if (snapshotDescriptionMatch) {
-            it(snapshotDescriptionMatch[1], () => {
-              expect(snapshot).toMatchSnapshot()
-            })
+            it(
+              `${i.toString().padStart(2, "0")}: ` +
+                snapshotDescriptionMatch[1],
+              () => {
+                expect(snapshot).toMatchSnapshot()
+              },
+            )
           } else {
             throw new Error("bad snapshot format")
           }
diff --git a/integration-tests/scoped-package/__snapshots__/scoped-package.test.ts.snap b/integration-tests/scoped-package/__snapshots__/scoped-package.test.ts.snap
index e9276144..dc3162d0 100644
--- a/integration-tests/scoped-package/__snapshots__/scoped-package.test.ts.snap
+++ b/integration-tests/scoped-package/__snapshots__/scoped-package.test.ts.snap
@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test scoped-package: add.d.ts should contain patch-package 1`] = `
-"SNAPSHOT: add.d.ts should contain patch-package
-import { patch-package } from \\"./index\\";
-export = patch-package;
+exports[`Test scoped-package: 00: left-pad typings should contain patch-package 1`] = `
+"SNAPSHOT: left-pad typings should contain patch-package
+// Definitions by: Zlatko patch-package <https://github.com/Goldsmith42/>
 END SNAPSHOT"
 `;
 
-exports[`Test scoped-package: left-pad typings should contain patch-package 1`] = `
-"SNAPSHOT: left-pad typings should contain patch-package
-// Definitions by: Zlatko patch-package <https://github.com/Goldsmith42/>
+exports[`Test scoped-package: 01: add.d.ts should contain patch-package 1`] = `
+"SNAPSHOT: add.d.ts should contain patch-package
+import { patch-package } from \\"./index\\";
+export = patch-package;
 END SNAPSHOT"
 `;
diff --git a/integration-tests/shrinkwrap/__snapshots__/shrinkwrap.test.ts.snap b/integration-tests/shrinkwrap/__snapshots__/shrinkwrap.test.ts.snap
index a78e9519..e5106d23 100644
--- a/integration-tests/shrinkwrap/__snapshots__/shrinkwrap.test.ts.snap
+++ b/integration-tests/shrinkwrap/__snapshots__/shrinkwrap.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test shrinkwrap: left pad should contain patch-package 1`] = `
+exports[`Test shrinkwrap: 00: left pad should contain patch-package 1`] = `
 "SNAPSHOT: left pad should contain patch-package
 module.exports = patch-package;
 END SNAPSHOT"
diff --git a/integration-tests/unexpected-patch-creation-failure/__snapshots__/unexpected-patch-creation-failure.test.ts.snap b/integration-tests/unexpected-patch-creation-failure/__snapshots__/unexpected-patch-creation-failure.test.ts.snap
index 0fc10e28..7c31f549 100644
--- a/integration-tests/unexpected-patch-creation-failure/__snapshots__/unexpected-patch-creation-failure.test.ts.snap
+++ b/integration-tests/unexpected-patch-creation-failure/__snapshots__/unexpected-patch-creation-failure.test.ts.snap
@@ -1,7 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test unexpected-patch-creation-failure: patch-package fails to parse a patch it created 1`] = `
+exports[`Test unexpected-patch-creation-failure: 00: patch-package fails to parse a patch it created 1`] = `
 "SNAPSHOT: patch-package fails to parse a patch it created
+patch-package 0.0.0
+• Creating temporary folder
+• Installing left-pad@1.3.0 with yarn
+• Diffing your files with clean files
 
 ⛔️ ERROR
         
diff --git a/integration-tests/unexpected-patch-creation-failure/unexpected-patch-creation-failure.sh b/integration-tests/unexpected-patch-creation-failure/unexpected-patch-creation-failure.sh
index 15588a57..ac347f3b 100755
--- a/integration-tests/unexpected-patch-creation-failure/unexpected-patch-creation-failure.sh
+++ b/integration-tests/unexpected-patch-creation-failure/unexpected-patch-creation-failure.sh
@@ -17,12 +17,12 @@ then
   exit 1
 fi
 
-(>&2 echo "SNAPSHOT: patch-package fails to parse a patch it created")
+echo "SNAPSHOT: patch-package fails to parse a patch it created"
 if patch-package left-pad
 then
   exit 1
 fi
-(>&2 echo "END SNAPSHOT")
+echo "END SNAPSHOT"
 
 echo "there is now an error log file"
 ls ./patch-package-error.json.gz
diff --git a/package.json b/package.json
index 3b53d8e7..6d2aea18 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "patch-package",
-  "version": "7.0.2",
+  "version": "8.0.0",
   "description": "Fix broken node modules with no fuss",
   "main": "dist/index.js",
   "repository": "github:ds300/patch-package",
@@ -52,6 +52,7 @@
     "@types/cross-spawn": "^6.0.0",
     "@types/fs-extra": "^9.0.0",
     "@types/jest": "^24.0.11",
+    "@types/json-stable-stringify": "^1.0.34",
     "@types/minimist": "^1.2.2",
     "@types/node": "^12.0.0",
     "@types/rimraf": "^2.0.2",
@@ -75,6 +76,7 @@
     "cross-spawn": "^7.0.3",
     "find-yarn-workspace-root": "^2.0.0",
     "fs-extra": "^9.0.0",
+    "json-stable-stringify": "^1.0.2",
     "klaw-sync": "^6.0.0",
     "minimist": "^1.2.6",
     "open": "^7.4.2",
diff --git a/property-based-tests/executeTestCase.ts b/property-based-tests/executeTestCase.ts
index 87d19a77..718fc735 100644
--- a/property-based-tests/executeTestCase.ts
+++ b/property-based-tests/executeTestCase.ts
@@ -1,5 +1,4 @@
 import * as tmp from "tmp"
-import * as path from "path"
 
 import { spawnSafeSync } from "../src/spawnSafe"
 import { executeEffects } from "../src/patch/apply"
@@ -8,6 +7,7 @@ import { reversePatch } from "../src/patch/reverse"
 
 import { TestCase, Files } from "./testCases"
 import { appendFileSync, existsSync, writeFileSync } from "fs"
+import { join, dirname } from "path"
 
 jest.mock("fs-extra", () => {
   let workingFiles: Files
@@ -24,7 +24,7 @@ jest.mock("fs-extra", () => {
     setWorkingFiles,
     getWorkingFiles,
     ensureDirSync: jest.fn(),
-    readFileSync: jest.fn(path => getWorkingFiles()[path].contents),
+    readFileSync: jest.fn((path) => getWorkingFiles()[path].contents),
     writeFileSync: jest.fn(
       (path: string, contents: string, opts?: { mode?: number }) => {
         getWorkingFiles()[path] = {
@@ -33,12 +33,12 @@ jest.mock("fs-extra", () => {
         }
       },
     ),
-    unlinkSync: jest.fn(path => delete getWorkingFiles()[path]),
+    unlinkSync: jest.fn((path) => delete getWorkingFiles()[path]),
     moveSync: jest.fn((from, to) => {
       getWorkingFiles()[to] = getWorkingFiles()[from]
       delete getWorkingFiles()[from]
     }),
-    statSync: jest.fn(path => getWorkingFiles()[path]),
+    statSync: jest.fn((path) => getWorkingFiles()[path]),
     chmodSync: jest.fn((path, mode) => {
       const { contents } = getWorkingFiles()[path]
       getWorkingFiles()[path] = { contents, mode }
@@ -49,10 +49,10 @@ jest.mock("fs-extra", () => {
 function writeFiles(cwd: string, files: Files): void {
   const mkdirpSync = require("fs-extra/lib/mkdirs/index.js").mkdirpSync
   const writeFileSync = require("fs").writeFileSync
-  Object.keys(files).forEach(filePath => {
+  Object.keys(files).forEach((filePath) => {
     if (!filePath.startsWith(".git/")) {
-      mkdirpSync(path.join(cwd, path.dirname(filePath)))
-      writeFileSync(path.join(cwd, filePath), files[filePath].contents, {
+      mkdirpSync(join(cwd, dirname(filePath)))
+      writeFileSync(join(cwd, filePath), files[filePath].contents, {
         mode: files[filePath].mode,
       })
     }
@@ -62,7 +62,7 @@ function writeFiles(cwd: string, files: Files): void {
 function removeLeadingSpaceOnBlankLines(patchFileContents: string): string {
   return patchFileContents
     .split("\n")
-    .map(line => (line === " " ? "" : line))
+    .map((line) => (line === " " ? "" : line))
     .join("\n")
 }
 
@@ -118,7 +118,8 @@ export function executeTestCase(testCase: TestCase) {
     patchFileContents,
   )
 
-  it("looks the same whether parsed with blank lines or not", () => {
+  // skipping because we add source to the hunks now, so we need to strip that out before comparing
+  it.skip("looks the same whether parsed with blank lines or not", () => {
     reportingFailures(() => {
       expect(parsePatchFile(patchFileContents)).toEqual(
         parsePatchFile(patchFileContentsWithBlankLines),
@@ -132,7 +133,7 @@ export function executeTestCase(testCase: TestCase) {
     fs.setWorkingFiles({ ...testCase.cleanFiles })
     reportingFailures(() => {
       const effects = parsePatchFile(patchFileContents)
-      executeEffects(effects, { dryRun: false })
+      executeEffects(effects, { dryRun: false, bestEffort: false })
       expect(fs.getWorkingFiles()).toEqual(testCase.modifiedFiles)
     })
   })
@@ -141,7 +142,7 @@ export function executeTestCase(testCase: TestCase) {
     fs.setWorkingFiles({ ...testCase.modifiedFiles })
     reportingFailures(() => {
       const effects = reversePatch(parsePatchFile(patchFileContents))
-      executeEffects(effects, { dryRun: false })
+      executeEffects(effects, { dryRun: false, bestEffort: false })
       expect(fs.getWorkingFiles()).toEqual(testCase.cleanFiles)
     })
   })
diff --git a/property-based-tests/testCases.ts b/property-based-tests/testCases.ts
index 8fef3bb8..8875f754 100644
--- a/property-based-tests/testCases.ts
+++ b/property-based-tests/testCases.ts
@@ -121,7 +121,7 @@ function insertLinesIntoFile(file: File): File {
 function getUniqueFilename(files: Files) {
   let filename = makeFileName()
   const ks = Object.keys(files)
-  while (ks.some(k => k.startsWith(filename))) {
+  while (ks.some((k) => k.startsWith(filename))) {
     filename = makeFileName()
   }
   return filename
diff --git a/src/PackageDetails.test.ts b/src/PackageDetails.test.ts
index 50cc2d9a..bc803873 100644
--- a/src/PackageDetails.test.ts
+++ b/src/PackageDetails.test.ts
@@ -1,86 +1,10 @@
 import {
   getPackageDetailsFromPatchFilename,
   getPatchDetailsFromCliString,
+  parseNameAndVersion,
 } from "./PackageDetails"
 
 describe("getPackageDetailsFromPatchFilename", () => {
-  it("parses old-style patch filenames", () => {
-    expect(
-      getPackageDetailsFromPatchFilename("@types/banana:3.4.2-beta.2.patch"),
-    ).toMatchInlineSnapshot(`
-Object {
-  "humanReadablePathSpecifier": "@types/banana",
-  "isDevOnly": false,
-  "isNested": false,
-  "name": "@types/banana",
-  "packageNames": Array [
-    "@types/banana",
-  ],
-  "patchFilename": "@types/banana:3.4.2-beta.2.patch",
-  "path": "node_modules/@types/banana",
-  "pathSpecifier": "@types/banana",
-  "version": "3.4.2-beta.2",
-}
-`)
-
-    expect(getPackageDetailsFromPatchFilename("banana:0.4.2.patch"))
-      .toMatchInlineSnapshot(`
-Object {
-  "humanReadablePathSpecifier": "banana",
-  "isDevOnly": false,
-  "isNested": false,
-  "name": "banana",
-  "packageNames": Array [
-    "banana",
-  ],
-  "patchFilename": "banana:0.4.2.patch",
-  "path": "node_modules/banana",
-  "pathSpecifier": "banana",
-  "version": "0.4.2",
-}
-`)
-
-    expect(getPackageDetailsFromPatchFilename("banana+0.4.2.patch"))
-      .toMatchInlineSnapshot(`
-Object {
-  "humanReadablePathSpecifier": "banana",
-  "isDevOnly": false,
-  "isNested": false,
-  "name": "banana",
-  "packageNames": Array [
-    "banana",
-  ],
-  "patchFilename": "banana+0.4.2.patch",
-  "path": "node_modules/banana",
-  "pathSpecifier": "banana",
-  "version": "0.4.2",
-}
-`)
-
-    expect(getPackageDetailsFromPatchFilename("banana-0.4.2.patch")).toBe(null)
-
-    expect(
-      getPackageDetailsFromPatchFilename("@types+banana-0.4.2.patch"),
-    ).toBe(null)
-
-    expect(getPackageDetailsFromPatchFilename("banana+0.4.2.dev.patch"))
-      .toMatchInlineSnapshot(`
-Object {
-  "humanReadablePathSpecifier": "banana",
-  "isDevOnly": true,
-  "isNested": false,
-  "name": "banana",
-  "packageNames": Array [
-    "banana",
-  ],
-  "patchFilename": "banana+0.4.2.dev.patch",
-  "path": "node_modules/banana",
-  "pathSpecifier": "banana",
-  "version": "0.4.2",
-}
-`)
-  })
-
   it("parses new-style patch filenames", () => {
     expect(getPackageDetailsFromPatchFilename("banana++apple+0.4.2.patch"))
       .toMatchInlineSnapshot(`
@@ -96,6 +20,8 @@ Object {
   "patchFilename": "banana++apple+0.4.2.patch",
   "path": "node_modules/banana/node_modules/apple",
   "pathSpecifier": "banana/apple",
+  "sequenceName": undefined,
+  "sequenceNumber": undefined,
   "version": "0.4.2",
 }
 `)
@@ -118,6 +44,8 @@ Object {
   "patchFilename": "@types+banana++@types+apple++@mollusc+man+0.4.2-banana-tree.patch",
   "path": "node_modules/@types/banana/node_modules/@types/apple/node_modules/@mollusc/man",
   "pathSpecifier": "@types/banana/@types/apple/@mollusc/man",
+  "sequenceName": undefined,
+  "sequenceNumber": undefined,
   "version": "0.4.2-banana-tree",
 }
 `)
@@ -139,6 +67,8 @@ Object {
   "patchFilename": "@types+banana.patch++hello+0.4.2-banana-tree.patch",
   "path": "node_modules/@types/banana.patch/node_modules/hello",
   "pathSpecifier": "@types/banana.patch/hello",
+  "sequenceName": undefined,
+  "sequenceNumber": undefined,
   "version": "0.4.2-banana-tree",
 }
 `)
@@ -160,8 +90,53 @@ Object {
   "patchFilename": "@types+banana.patch++hello+0.4.2-banana-tree.dev.patch",
   "path": "node_modules/@types/banana.patch/node_modules/hello",
   "pathSpecifier": "@types/banana.patch/hello",
+  "sequenceName": undefined,
+  "sequenceNumber": undefined,
   "version": "0.4.2-banana-tree",
 }
+`)
+  })
+
+  it("works for ordered patches", () => {
+    expect(getPackageDetailsFromPatchFilename("left-pad+1.3.0+02+world"))
+      .toMatchInlineSnapshot(`
+Object {
+  "humanReadablePathSpecifier": "left-pad",
+  "isDevOnly": false,
+  "isNested": false,
+  "name": "left-pad",
+  "packageNames": Array [
+    "left-pad",
+  ],
+  "patchFilename": "left-pad+1.3.0+02+world",
+  "path": "node_modules/left-pad",
+  "pathSpecifier": "left-pad",
+  "sequenceName": "world",
+  "sequenceNumber": 2,
+  "version": "1.3.0",
+}
+`)
+
+    expect(
+      getPackageDetailsFromPatchFilename(
+        "@microsoft/api-extractor+2.0.0+01+FixThing",
+      ),
+    ).toMatchInlineSnapshot(`
+Object {
+  "humanReadablePathSpecifier": "@microsoft/api-extractor",
+  "isDevOnly": false,
+  "isNested": false,
+  "name": "@microsoft/api-extractor",
+  "packageNames": Array [
+    "@microsoft/api-extractor",
+  ],
+  "patchFilename": "@microsoft/api-extractor+2.0.0+01+FixThing",
+  "path": "node_modules/@microsoft/api-extractor",
+  "pathSpecifier": "@microsoft/api-extractor",
+  "sequenceName": "FixThing",
+  "sequenceNumber": 1,
+  "version": "2.0.0",
+}
 `)
   })
 })
@@ -280,3 +255,93 @@ Object {
     )
   })
 })
+
+describe("parseNameAndVersion", () => {
+  it("works for good-looking names", () => {
+    expect(parseNameAndVersion("lodash+2.3.4")).toMatchInlineSnapshot(`
+Object {
+  "packageName": "lodash",
+  "version": "2.3.4",
+}
+`)
+    expect(parseNameAndVersion("patch-package+2.0.0-alpha.3"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "patch-package",
+  "version": "2.0.0-alpha.3",
+}
+`)
+  })
+  it("works for scoped package names", () => {
+    expect(parseNameAndVersion("@react-spring+rafz+2.0.0-alpha.3"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "@react-spring/rafz",
+  "version": "2.0.0-alpha.3",
+}
+`)
+    expect(parseNameAndVersion("@microsoft+api-extractor+2.2.3"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "@microsoft/api-extractor",
+  "version": "2.2.3",
+}
+`)
+  })
+  it("works for ordered patches", () => {
+    expect(parseNameAndVersion("patch-package+2.0.0+01"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "patch-package",
+  "sequenceNumber": 1,
+  "version": "2.0.0",
+}
+`)
+    expect(parseNameAndVersion("@react-spring+rafz+2.0.0-alpha.3+23"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "@react-spring/rafz",
+  "sequenceNumber": 23,
+  "version": "2.0.0-alpha.3",
+}
+`)
+    expect(parseNameAndVersion("@microsoft+api-extractor+2.0.0+001"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "@microsoft/api-extractor",
+  "sequenceNumber": 1,
+  "version": "2.0.0",
+}
+`)
+  })
+
+  it("works for ordered patches with names", () => {
+    expect(parseNameAndVersion("patch-package+2.0.0+021+FixImportantThing"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "patch-package",
+  "sequenceName": "FixImportantThing",
+  "sequenceNumber": 21,
+  "version": "2.0.0",
+}
+`)
+    expect(parseNameAndVersion("@react-spring+rafz+2.0.0-alpha.3+000023+Foo"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "@react-spring/rafz",
+  "sequenceName": "Foo",
+  "sequenceNumber": 23,
+  "version": "2.0.0-alpha.3",
+}
+`)
+    expect(parseNameAndVersion("@microsoft+api-extractor+2.0.0+001+Bar"))
+      .toMatchInlineSnapshot(`
+Object {
+  "packageName": "@microsoft/api-extractor",
+  "sequenceName": "Bar",
+  "sequenceNumber": 1,
+  "version": "2.0.0",
+}
+`)
+  })
+})
diff --git a/src/PackageDetails.ts b/src/PackageDetails.ts
index 4b44015e..259ac189 100644
--- a/src/PackageDetails.ts
+++ b/src/PackageDetails.ts
@@ -13,32 +13,76 @@ export interface PatchedPackageDetails extends PackageDetails {
   version: string
   patchFilename: string
   isDevOnly: boolean
+  sequenceName?: string
+  sequenceNumber?: number
 }
 
-function parseNameAndVersion(
-  s: string,
+export function parseNameAndVersion(
+  str: string,
 ): {
-  name: string
+  packageName: string
   version?: string
+  sequenceName?: string
+  sequenceNumber?: number
 } | null {
-  const parts = s.split("+")
-  switch (parts.length) {
+  const parts = str
+    .split("+")
+    .map((s) => s.trim())
+    .filter(Boolean)
+  if (parts.length === 0) {
+    return null
+  }
+  if (parts.length === 1) {
+    return { packageName: str }
+  }
+  const versionIndex = parts.findIndex((part) =>
+    part.match(/^\d+\.\d+\.\d+.*$/),
+  )
+  if (versionIndex === -1) {
+    const [scope, name] = parts
+    return { packageName: `${scope}/${name}` }
+  }
+  const nameParts = parts.slice(0, versionIndex)
+  let packageName
+  switch (nameParts.length) {
+    case 0:
+      return null
+    case 1:
+      packageName = nameParts[0]
+      break
+    case 2:
+      const [scope, name] = nameParts
+      packageName = `${scope}/${name}`
+      break
+    default:
+      return null
+  }
+
+  const version = parts[versionIndex]
+  const sequenceParts = parts.slice(versionIndex + 1)
+  if (sequenceParts.length === 0) {
+    return { packageName, version }
+  }
+
+  // expect sequenceParts[0] to be a number, strip leading 0s
+  const sequenceNumber = parseInt(sequenceParts[0].replace(/^0+/, ""), 10)
+  if (isNaN(sequenceNumber)) {
+    return null
+  }
+  switch (sequenceParts.length) {
     case 1: {
-      return { name: parts[0] }
+      return { packageName, version, sequenceNumber }
     }
     case 2: {
-      const [nameOrScope, versionOrName] = parts
-      if (versionOrName.match(/^\d+/)) {
-        return {
-          name: nameOrScope,
-          version: versionOrName,
-        }
+      return {
+        packageName,
+        version,
+        sequenceName: sequenceParts[1],
+        sequenceNumber,
       }
-      return { name: `${nameOrScope}/${versionOrName}` }
     }
-    case 3: {
-      const [scope, name, version] = parts
-      return { name: `${scope}/${name}`, version }
+    default: {
+      return null
     }
   }
   return null
@@ -47,27 +91,6 @@ function parseNameAndVersion(
 export function getPackageDetailsFromPatchFilename(
   patchFilename: string,
 ): PatchedPackageDetails | null {
-  const legacyMatch = patchFilename.match(
-    /^([^+=]+?)(:|\+)(\d+\.\d+\.\d+.*?)(\.dev)?\.patch$/,
-  )
-
-  if (legacyMatch) {
-    const name = legacyMatch[1]
-    const version = legacyMatch[3]
-
-    return {
-      packageNames: [name],
-      pathSpecifier: name,
-      humanReadablePathSpecifier: name,
-      path: join("node_modules", name),
-      name,
-      version,
-      isNested: false,
-      patchFilename,
-      isDevOnly: patchFilename.endsWith(".dev.patch"),
-    }
-  }
-
   const parts = patchFilename
     .replace(/(\.dev)?\.patch$/, "")
     .split("++")
@@ -85,18 +108,22 @@ export function getPackageDetailsFromPatchFilename(
   }
 
   return {
-    name: lastPart.name,
+    name: lastPart.packageName,
     version: lastPart.version,
     path: join(
       "node_modules",
-      parts.map(({ name }) => name).join("/node_modules/"),
+      parts.map(({ packageName: name }) => name).join("/node_modules/"),
     ),
     patchFilename,
-    pathSpecifier: parts.map(({ name }) => name).join("/"),
-    humanReadablePathSpecifier: parts.map(({ name }) => name).join(" => "),
+    pathSpecifier: parts.map(({ packageName: name }) => name).join("/"),
+    humanReadablePathSpecifier: parts
+      .map(({ packageName: name }) => name)
+      .join(" => "),
     isNested: parts.length > 1,
-    packageNames: parts.map(({ name }) => name),
+    packageNames: parts.map(({ packageName: name }) => name),
     isDevOnly: patchFilename.endsWith(".dev.patch"),
+    sequenceName: lastPart.sequenceName,
+    sequenceNumber: lastPart.sequenceNumber,
   }
 }
 
diff --git a/src/applyPatches.ts b/src/applyPatches.ts
index 2bc4aba3..1a50d094 100644
--- a/src/applyPatches.ts
+++ b/src/applyPatches.ts
@@ -1,17 +1,23 @@
 import chalk from "chalk"
-import { getPatchFiles } from "./patchFs"
-import { executeEffects } from "./patch/apply"
+import { writeFileSync } from "fs"
 import { existsSync } from "fs-extra"
-import { join, resolve, relative } from "./path"
 import { posix } from "path"
-import {
-  getPackageDetailsFromPatchFilename,
-  PackageDetails,
-} from "./PackageDetails"
-import { reversePatch } from "./patch/reverse"
 import semver from "semver"
-import { readPatch } from "./patch/read"
+import { hashFile } from "./hash"
+import { logPatchSequenceError } from "./makePatch"
+import { PackageDetails, PatchedPackageDetails } from "./PackageDetails"
 import { packageIsDevDependency } from "./packageIsDevDependency"
+import { executeEffects } from "./patch/apply"
+import { readPatch } from "./patch/read"
+import { reversePatch } from "./patch/reverse"
+import { getGroupedPatches } from "./patchFs"
+import { join, relative } from "./path"
+import {
+  clearPatchApplicationState,
+  getPatchApplicationState,
+  PatchState,
+  savePatchApplicationState,
+} from "./stateFile"
 
 class PatchApplicationError extends Error {
   constructor(msg: string) {
@@ -19,14 +25,6 @@ class PatchApplicationError extends Error {
   }
 }
 
-function findPatchFiles(patchesDirectory: string): string[] {
-  if (!existsSync(patchesDirectory)) {
-    return []
-  }
-
-  return getPatchFiles(patchesDirectory) as string[]
-}
-
 function getInstalledPackageVersion({
   appPath,
   path,
@@ -79,49 +77,160 @@ function getInstalledPackageVersion({
   return result as string
 }
 
+function logPatchApplication(patchDetails: PatchedPackageDetails) {
+  const sequenceString =
+    patchDetails.sequenceNumber != null
+      ? ` (${patchDetails.sequenceNumber}${
+          patchDetails.sequenceName ? " " + patchDetails.sequenceName : ""
+        })`
+      : ""
+  console.log(
+    `${chalk.bold(patchDetails.pathSpecifier)}@${
+      patchDetails.version
+    }${sequenceString} ${chalk.green("✔")}`,
+  )
+}
+
 export function applyPatchesForApp({
   appPath,
   reverse,
   patchDir,
   shouldExitWithError,
   shouldExitWithWarning,
+  bestEffort,
 }: {
   appPath: string
   reverse: boolean
   patchDir: string
   shouldExitWithError: boolean
   shouldExitWithWarning: boolean
+  bestEffort: boolean
 }): void {
   const patchesDirectory = join(appPath, patchDir)
-  const files = findPatchFiles(patchesDirectory)
+  const groupedPatches = getGroupedPatches(patchesDirectory)
 
-  if (files.length === 0) {
-    console.error(chalk.blueBright("No patch files found"))
+  if (groupedPatches.numPatchFiles === 0) {
+    console.log(chalk.blueBright("No patch files found"))
     return
   }
 
   const errors: string[] = []
-  const warnings: string[] = []
+  const warnings: string[] = [...groupedPatches.warnings]
+
+  for (const patches of Object.values(
+    groupedPatches.pathSpecifierToPatchFiles,
+  )) {
+    applyPatchesForPackage({
+      patches,
+      appPath,
+      patchDir,
+      reverse,
+      warnings,
+      errors,
+      bestEffort,
+    })
+  }
 
-  for (const filename of files) {
-    try {
-      const packageDetails = getPackageDetailsFromPatchFilename(filename)
+  for (const warning of warnings) {
+    console.log(warning)
+  }
+  for (const error of errors) {
+    console.log(error)
+  }
+
+  const problemsSummary = []
+  if (warnings.length) {
+    problemsSummary.push(chalk.yellow(`${warnings.length} warning(s)`))
+  }
+  if (errors.length) {
+    problemsSummary.push(chalk.red(`${errors.length} error(s)`))
+  }
 
-      if (!packageDetails) {
-        warnings.push(
-          `Unrecognized patch file in patches directory ${filename}`,
+  if (problemsSummary.length) {
+    console.log("---")
+    console.log("patch-package finished with", problemsSummary.join(", ") + ".")
+  }
+
+  if (errors.length && shouldExitWithError) {
+    process.exit(1)
+  }
+
+  if (warnings.length && shouldExitWithWarning) {
+    process.exit(1)
+  }
+
+  process.exit(0)
+}
+
+export function applyPatchesForPackage({
+  patches,
+  appPath,
+  patchDir,
+  reverse,
+  warnings,
+  errors,
+  bestEffort,
+}: {
+  patches: PatchedPackageDetails[]
+  appPath: string
+  patchDir: string
+  reverse: boolean
+  warnings: string[]
+  errors: string[]
+  bestEffort: boolean
+}) {
+  const pathSpecifier = patches[0].pathSpecifier
+  const state = patches.length > 1 ? getPatchApplicationState(patches[0]) : null
+  const unappliedPatches = patches.slice(0)
+  const appliedPatches: PatchedPackageDetails[] = []
+  // if there are multiple patches to apply, we can't rely on the reverse-patch-dry-run behavior to make this operation
+  // idempotent, so instead we need to check the state file to see whether we have already applied any of the patches
+  // todo: once this is battle tested we might want to use the same approach for single patches as well, but it's not biggie since the dry run thing is fast
+  if (unappliedPatches && state) {
+    for (let i = 0; i < state.patches.length; i++) {
+      const patchThatWasApplied = state.patches[i]
+      if (!patchThatWasApplied.didApply) {
+        break
+      }
+      const patchToApply = unappliedPatches[0]
+      const currentPatchHash = hashFile(
+        join(appPath, patchDir, patchToApply.patchFilename),
+      )
+      if (patchThatWasApplied.patchContentHash === currentPatchHash) {
+        // this patch was applied we can skip it
+        appliedPatches.push(unappliedPatches.shift()!)
+      } else {
+        console.log(
+          chalk.red("Error:"),
+          `The patches for ${chalk.bold(pathSpecifier)} have changed.`,
+          `You should reinstall your node_modules folder to make sure the package is up to date`,
         )
-        continue
+        process.exit(1)
       }
+    }
+  }
 
-      const {
-        name,
-        version,
-        path,
-        pathSpecifier,
-        isDevOnly,
-        patchFilename,
-      } = packageDetails
+  if (reverse && state) {
+    // if we are reversing the patches we need to make the unappliedPatches array
+    // be the reversed version of the appliedPatches array.
+    // The applied patches array should then be empty because it is used differently
+    // when outputting the state file.
+    unappliedPatches.length = 0
+    unappliedPatches.push(...appliedPatches)
+    unappliedPatches.reverse()
+    appliedPatches.length = 0
+  }
+  if (appliedPatches.length) {
+    // some patches have already been applied
+    appliedPatches.forEach(logPatchApplication)
+  }
+  if (!unappliedPatches.length) {
+    return
+  }
+  let failedPatch: PatchedPackageDetails | null = null
+  packageLoop: for (const patchDetails of unappliedPatches) {
+    try {
+      const { name, version, path, isDevOnly, patchFilename } = patchDetails
 
       const installedPackageVersion = getInstalledPackageVersion({
         appPath,
@@ -131,7 +240,10 @@ export function applyPatchesForApp({
           isDevOnly ||
           // check for direct-dependents in prod
           (process.env.NODE_ENV === "production" &&
-            packageIsDevDependency({ appPath, packageDetails })),
+            packageIsDevDependency({
+              appPath,
+              patchDetails,
+            })),
         patchFilename,
       })
       if (!installedPackageVersion) {
@@ -146,12 +258,15 @@ export function applyPatchesForApp({
 
       if (
         applyPatch({
-          patchFilePath: resolve(patchesDirectory, filename) as string,
+          patchFilePath: join(appPath, patchDir, patchFilename) as string,
           reverse,
-          packageDetails,
+          patchDetails,
           patchDir,
+          cwd: process.cwd(),
+          bestEffort,
         })
       ) {
+        appliedPatches.push(patchDetails)
         // yay patch was applied successfully
         // print warning if version mismatch
         if (installedPackageVersion !== version) {
@@ -165,92 +280,168 @@ export function applyPatchesForApp({
             }),
           )
         }
-        console.log(
-          `${chalk.bold(pathSpecifier)}@${version} ${chalk.green("✔")}`,
-        )
+        logPatchApplication(patchDetails)
+      } else if (patches.length > 1) {
+        logPatchSequenceError({ patchDetails })
+        // in case the package has multiple patches, we need to break out of this inner loop
+        // because we don't want to apply more patches on top of the broken state
+        failedPatch = patchDetails
+        break packageLoop
       } else if (installedPackageVersion === version) {
         // completely failed to apply patch
         // TODO: propagate useful error messages from patch application
         errors.push(
           createBrokenPatchFileError({
             packageName: name,
-            patchFileName: filename,
+            patchFilename,
             pathSpecifier,
             path,
           }),
         )
+        break packageLoop
       } else {
         errors.push(
-          createPatchApplictionFailureError({
+          createPatchApplicationFailureError({
             packageName: name,
             actualVersion: installedPackageVersion,
             originalVersion: version,
-            patchFileName: filename,
+            patchFilename,
             path,
             pathSpecifier,
           }),
         )
+        // in case the package has multiple patches, we need to break out of this inner loop
+        // because we don't want to apply more patches on top of the broken state
+        break packageLoop
       }
     } catch (error) {
       if (error instanceof PatchApplicationError) {
         errors.push(error.message)
       } else {
-        errors.push(createUnexpectedError({ filename, error }))
+        errors.push(
+          createUnexpectedError({
+            filename: patchDetails.patchFilename,
+            error: error as Error,
+          }),
+        )
       }
+      // in case the package has multiple patches, we need to break out of this inner loop
+      // because we don't want to apply more patches on top of the broken state
+      break packageLoop
     }
   }
 
-  for (const warning of warnings) {
-    console.warn(warning)
-  }
-  for (const error of errors) {
-    console.error(error)
-  }
-
-  const problemsSummary = []
-  if (warnings.length) {
-    problemsSummary.push(chalk.yellow(`${warnings.length} warning(s)`))
-  }
-  if (errors.length) {
-    problemsSummary.push(chalk.red(`${errors.length} error(s)`))
-  }
-
-  if (problemsSummary.length) {
-    console.error("---")
-    console.error(
-      "patch-package finished with",
-      problemsSummary.join(", ") + ".",
-    )
-  }
-
-  if (errors.length && shouldExitWithError) {
-    process.exit(1)
-  }
+  if (patches.length > 1) {
+    if (reverse) {
+      if (!state) {
+        throw new Error("unexpected state: no state file found while reversing")
+      }
+      // if we removed all the patches that were previously applied we can delete the state file
+      if (appliedPatches.length === patches.length) {
+        clearPatchApplicationState(patches[0])
+      } else {
+        // We failed while reversing patches and some are still in the applied state.
+        // We need to update the state file to reflect that.
+        // appliedPatches is currently the patches that were successfully reversed, in the order they were reversed
+        // So we need to find the index of the last reversed patch in the original patches array
+        // and then remove all the patches after that. Sorry for the confusing code.
+        const lastReversedPatchIndex = patches.indexOf(
+          appliedPatches[appliedPatches.length - 1],
+        )
+        if (lastReversedPatchIndex === -1) {
+          throw new Error(
+            "unexpected state: failed to find last reversed patch in original patches array",
+          )
+        }
 
-  if (warnings.length && shouldExitWithWarning) {
-    process.exit(1)
+        savePatchApplicationState({
+          packageDetails: patches[0],
+          patches: patches.slice(0, lastReversedPatchIndex).map((patch) => ({
+            didApply: true,
+            patchContentHash: hashFile(
+              join(appPath, patchDir, patch.patchFilename),
+            ),
+            patchFilename: patch.patchFilename,
+          })),
+          isRebasing: false,
+        })
+      }
+    } else {
+      const nextState = appliedPatches.map(
+        (patch): PatchState => ({
+          didApply: true,
+          patchContentHash: hashFile(
+            join(appPath, patchDir, patch.patchFilename),
+          ),
+          patchFilename: patch.patchFilename,
+        }),
+      )
+
+      if (failedPatch) {
+        nextState.push({
+          didApply: false,
+          patchContentHash: hashFile(
+            join(appPath, patchDir, failedPatch.patchFilename),
+          ),
+          patchFilename: failedPatch.patchFilename,
+        })
+      }
+      savePatchApplicationState({
+        packageDetails: patches[0],
+        patches: nextState,
+        isRebasing: !!failedPatch,
+      })
+    }
+    if (failedPatch) {
+      process.exit(1)
+    }
   }
-
-  process.exit(0)
 }
 
 export function applyPatch({
   patchFilePath,
   reverse,
-  packageDetails,
+  patchDetails,
   patchDir,
+  cwd,
+  bestEffort,
 }: {
   patchFilePath: string
   reverse: boolean
-  packageDetails: PackageDetails
+  patchDetails: PackageDetails
   patchDir: string
+  cwd: string
+  bestEffort: boolean
 }): boolean {
-  const patch = readPatch({ patchFilePath, packageDetails, patchDir })
+  const patch = readPatch({
+    patchFilePath,
+    patchDetails,
+    patchDir,
+  })
+
+  const forward = reverse ? reversePatch(patch) : patch
   try {
-    executeEffects(reverse ? reversePatch(patch) : patch, { dryRun: false })
+    if (!bestEffort) {
+      executeEffects(forward, { dryRun: true, cwd, bestEffort: false })
+    }
+    const errors: string[] | undefined = bestEffort ? [] : undefined
+    executeEffects(forward, { dryRun: false, cwd, bestEffort, errors })
+    if (errors?.length) {
+      console.log(
+        "Saving errors to",
+        chalk.cyan.bold("./patch-package-errors.log"),
+      )
+      writeFileSync("patch-package-errors.log", errors.join("\n\n"))
+      process.exit(0)
+    }
   } catch (e) {
     try {
-      executeEffects(reverse ? patch : reversePatch(patch), { dryRun: true })
+      const backward = reverse ? patch : reversePatch(patch)
+      executeEffects(backward, {
+        dryRun: true,
+        cwd,
+        bestEffort: false,
+      })
     } catch (e) {
       return false
     }
@@ -302,12 +493,12 @@ ${chalk.yellow("Warning:")} patch-package detected a patch file version mismatch
 
 function createBrokenPatchFileError({
   packageName,
-  patchFileName,
+  patchFilename,
   path,
   pathSpecifier,
 }: {
   packageName: string
-  patchFileName: string
+  patchFilename: string
   path: string
   pathSpecifier: string
 }) {
@@ -320,7 +511,7 @@ ${chalk.red.bold("**ERROR**")} ${chalk.red(
 
   This error was caused because patch-package cannot apply the following patch file:
 
-    patches/${patchFileName}
+    patches/${patchFilename}
 
   Try removing node_modules and trying again. If that doesn't work, maybe there was
   an accidental change made to the patch file? Try recreating it by manually
@@ -336,18 +527,18 @@ ${chalk.red.bold("**ERROR**")} ${chalk.red(
 `
 }
 
-function createPatchApplictionFailureError({
+function createPatchApplicationFailureError({
   packageName,
   actualVersion,
   originalVersion,
-  patchFileName,
+  patchFilename,
   path,
   pathSpecifier,
 }: {
   packageName: string
   actualVersion: string
   originalVersion: string
-  patchFileName: string
+  patchFilename: string
   path: string
   pathSpecifier: string
 }) {
@@ -376,7 +567,7 @@ ${chalk.red.bold("**ERROR**")} ${chalk.red(
     patch-package ${pathSpecifier}
 
   Info:
-    Patch file: patches/${patchFileName}
+    Patch file: patches/${patchFilename}
     Patch was made for version: ${chalk.green.bold(originalVersion)}
     Installed version: ${chalk.red.bold(actualVersion)}
 `
diff --git a/src/createIssue.ts b/src/createIssue.ts
index 6ce03e8f..de9e721d 100644
--- a/src/createIssue.ts
+++ b/src/createIssue.ts
@@ -29,7 +29,7 @@ function parseRepoString(
   return { org, repo, provider: "GitHub" }
 }
 
-function getPackageVCSDetails(packageDetails: PackageDetails) {
+export function getPackageVCSDetails(packageDetails: PackageDetails) {
   const repository = require(resolve(join(packageDetails.path, "package.json")))
     .repository as undefined | string | { url: string }
 
@@ -61,11 +61,11 @@ export function shouldRecommendIssue(
 }
 
 export function maybePrintIssueCreationPrompt(
+  vcs: ReturnType<typeof getPackageVCSDetails>,
   packageDetails: PackageDetails,
   packageManager: PackageManager,
 ) {
-  const vcs = getPackageVCSDetails(packageDetails)
-  if (vcs && shouldRecommendIssue(vcs)) {
+  if (vcs) {
     console.log(`💡 ${chalk.bold(packageDetails.name)} is on ${
       vcs.provider
     }! To draft an issue based on your patch run
@@ -89,7 +89,7 @@ export function openIssueCreationLink({
   const vcs = getPackageVCSDetails(packageDetails)
 
   if (!vcs) {
-    console.error(
+    console.log(
       `Error: Couldn't find VCS details for ${packageDetails.pathSpecifier}`,
     )
     process.exit(1)
diff --git a/src/detectPackageManager.ts b/src/detectPackageManager.ts
index 00976527..c7bb7559 100644
--- a/src/detectPackageManager.ts
+++ b/src/detectPackageManager.ts
@@ -7,7 +7,7 @@ import findWorkspaceRoot from "find-yarn-workspace-root"
 export type PackageManager = "yarn" | "npm" | "npm-shrinkwrap"
 
 function printNoYarnLockfileError() {
-  console.error(`
+  console.log(`
 ${chalk.red.bold("**ERROR**")} ${chalk.red(
     `The --use-yarn option was specified but there is no yarn.lock file`,
   )}
@@ -15,7 +15,7 @@ ${chalk.red.bold("**ERROR**")} ${chalk.red(
 }
 
 function printNoLockfilesError() {
-  console.error(`
+  console.log(`
 ${chalk.red.bold("**ERROR**")} ${chalk.red(
     `No package-lock.json, npm-shrinkwrap.json, or yarn.lock file.
 
diff --git a/src/filterFiles.ts b/src/filterFiles.ts
index 60983b32..c707cd72 100644
--- a/src/filterFiles.ts
+++ b/src/filterFiles.ts
@@ -8,10 +8,10 @@ export function removeIgnoredFiles(
   excludePaths: RegExp,
 ) {
   klawSync(dir, { nodir: true })
-    .map(item => item.path.slice(`${dir}/`.length))
+    .map((item) => item.path.slice(`${dir}/`.length))
     .filter(
-      relativePath =>
+      (relativePath) =>
         !relativePath.match(includePaths) || relativePath.match(excludePaths),
     )
-    .forEach(relativePath => removeSync(join(dir, relativePath)))
+    .forEach((relativePath) => removeSync(join(dir, relativePath)))
 }
diff --git a/src/getPackageResolution.ts b/src/getPackageResolution.ts
index 24db4bd6..a046e7f9 100644
--- a/src/getPackageResolution.ts
+++ b/src/getPackageResolution.ts
@@ -42,7 +42,7 @@ export function getPackageResolution({
       try {
         appLockFile = yaml.parse(lockFileString)
       } catch (e) {
-        console.error(e)
+        console.log(e)
         throw new Error("Could not parse yarn v2 lock file")
       }
     }
@@ -70,7 +70,7 @@ export function getPackageResolution({
     }
 
     if (new Set(resolutions).size !== 1) {
-      console.warn(
+      console.log(
         `Ambigious lockfile entries for ${packageDetails.pathSpecifier}. Using version ${installedVersion}`,
       )
       return installedVersion
@@ -125,7 +125,7 @@ export function getPackageResolution({
 if (require.main === module) {
   const packageDetails = getPatchDetailsFromCliString(process.argv[2])
   if (!packageDetails) {
-    console.error(`Can't find package ${process.argv[2]}`)
+    console.log(`Can't find package ${process.argv[2]}`)
     process.exit(1)
   }
   console.log(
diff --git a/src/hash.ts b/src/hash.ts
new file mode 100644
index 00000000..5ce097ad
--- /dev/null
+++ b/src/hash.ts
@@ -0,0 +1,30 @@
+import { createHash } from "crypto"
+import { openSync, readSync, closeSync, statSync } from "fs"
+
+const bufferSize = 1024
+
+const buffer = Buffer.alloc(bufferSize)
+
+export function hashFile(filePath: string) {
+  const sha = createHash("sha256")
+  const fileDescriptor = openSync(filePath, "r")
+  const size = statSync(filePath).size
+  let totalBytesRead = 0
+  while (totalBytesRead < size) {
+    const bytesRead = readSync(
+      fileDescriptor,
+      buffer,
+      0,
+      Math.min(size - totalBytesRead, bufferSize),
+      totalBytesRead,
+    )
+    if (bytesRead < bufferSize) {
+      sha.update(buffer.slice(0, bytesRead))
+    } else {
+      sha.update(buffer)
+    }
+    totalBytesRead += bytesRead
+  }
+  closeSync(fileDescriptor)
+  return sha.digest("hex")
+}
diff --git a/src/index.ts b/src/index.ts
index 6278f04a..8ee449a9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -11,6 +11,7 @@ import { join } from "./path"
 import { normalize, sep } from "path"
 import slash = require("slash")
 import { isCI } from "ci-info"
+import { rebase } from "./rebase"
 
 const appPath = getAppRootPath()
 const argv = minimist(process.argv.slice(2), {
@@ -23,8 +24,10 @@ const argv = minimist(process.argv.slice(2), {
     "error-on-fail",
     "error-on-warn",
     "create-issue",
+    "partial",
+    "",
   ],
-  string: ["patch-dir"],
+  string: ["patch-dir", "append", "rebase"],
 })
 const packageNames = argv._
 
@@ -43,7 +46,30 @@ if (argv.version || argv.v) {
   if (patchDir.startsWith("/")) {
     throw new Error("--patch-dir must be a relative path")
   }
-  if (packageNames.length) {
+  if ("rebase" in argv) {
+    if (!argv.rebase) {
+      console.log(
+        chalk.red(
+          "You must specify a patch file name or number when rebasing patches",
+        ),
+      )
+      process.exit(1)
+    }
+    if (packageNames.length !== 1) {
+      console.log(
+        chalk.red(
+          "You must specify exactly one package name when rebasing patches",
+        ),
+      )
+      process.exit(1)
+    }
+    rebase({
+      appPath,
+      packagePathSpecifier: packageNames[0],
+      patchDir,
+      targetPatch: argv.rebase,
+    })
+  } else if (packageNames.length) {
     const includePaths = makeRegExp(
       argv.include,
       "include",
@@ -70,6 +96,10 @@ if (argv.version || argv.v) {
         excludePaths,
         patchDir,
         createIssue,
+        mode:
+          "append" in argv
+            ? { type: "append", name: argv.append || undefined }
+            : { type: "overwrite_last" },
       })
     })
   } else {
@@ -91,6 +121,7 @@ if (argv.version || argv.v) {
       patchDir,
       shouldExitWithError,
       shouldExitWithWarning,
+      bestEffort: argv.partial,
     })
   }
 }
diff --git a/src/makePatch.ts b/src/makePatch.ts
index d51465d3..4d040297 100644
--- a/src/makePatch.ts
+++ b/src/makePatch.ts
@@ -1,40 +1,53 @@
 import chalk from "chalk"
-import { join, dirname, resolve } from "./path"
-import { spawnSafeSync } from "./spawnSafe"
-import { PackageManager } from "./detectPackageManager"
-import { removeIgnoredFiles } from "./filterFiles"
+import console from "console"
+import { renameSync } from "fs"
 import {
-  writeFileSync,
+  copySync,
   existsSync,
-  mkdirSync,
-  unlinkSync,
   mkdirpSync,
+  mkdirSync,
   realpathSync,
+  writeFileSync,
 } from "fs-extra"
 import { sync as rimraf } from "rimraf"
-import { copySync } from "fs-extra"
 import { dirSync } from "tmp"
-import { getPatchFiles } from "./patchFs"
+import { gzipSync } from "zlib"
+import { applyPatch } from "./applyPatches"
+import {
+  getPackageVCSDetails,
+  maybePrintIssueCreationPrompt,
+  openIssueCreationLink,
+  shouldRecommendIssue,
+} from "./createIssue"
+import { PackageManager } from "./detectPackageManager"
+import { removeIgnoredFiles } from "./filterFiles"
+import { getPackageResolution } from "./getPackageResolution"
+import { getPackageVersion } from "./getPackageVersion"
+import { hashFile } from "./hash"
 import {
   getPatchDetailsFromCliString,
-  getPackageDetailsFromPatchFilename,
   PackageDetails,
+  PatchedPackageDetails,
 } from "./PackageDetails"
-import { resolveRelativeFileDependencies } from "./resolveRelativeFileDependencies"
-import { getPackageResolution } from "./getPackageResolution"
 import { parsePatchFile } from "./patch/parse"
-import { gzipSync } from "zlib"
-import { getPackageVersion } from "./getPackageVersion"
+import { getGroupedPatches } from "./patchFs"
+import { dirname, join, resolve } from "./path"
+import { resolveRelativeFileDependencies } from "./resolveRelativeFileDependencies"
+import { spawnSafeSync } from "./spawnSafe"
 import {
-  maybePrintIssueCreationPrompt,
-  openIssueCreationLink,
-} from "./createIssue"
+  clearPatchApplicationState,
+  getPatchApplicationState,
+  PatchState,
+  savePatchApplicationState,
+  STATE_FILE_NAME,
+  verifyAppliedPatches,
+} from "./stateFile"
 
 function printNoPackageFoundError(
   packageName: string,
   packageJsonPath: string,
 ) {
-  console.error(
+  console.log(
     `No such package ${packageName}
 
   File not found: ${packageJsonPath}`,
@@ -49,6 +62,7 @@ export function makePatch({
   excludePaths,
   patchDir,
   createIssue,
+  mode,
 }: {
   packagePathSpecifier: string
   appPath: string
@@ -57,13 +71,79 @@ export function makePatch({
   excludePaths: RegExp
   patchDir: string
   createIssue: boolean
+  mode: { type: "overwrite_last" } | { type: "append"; name?: string }
 }) {
   const packageDetails = getPatchDetailsFromCliString(packagePathSpecifier)
 
   if (!packageDetails) {
-    console.error("No such package", packagePathSpecifier)
+    console.log("No such package", packagePathSpecifier)
     return
   }
+
+  const state = getPatchApplicationState(packageDetails)
+  const isRebasing = state?.isRebasing ?? false
+
+  // If we are rebasing and no patches have been applied, --append is the only valid option because
+  // there are no previous patches to overwrite/update
+  if (
+    isRebasing &&
+    state?.patches.filter((p) => p.didApply).length === 0 &&
+    mode.type === "overwrite_last"
+  ) {
+    mode = { type: "append", name: "initial" }
+  }
+
+  if (isRebasing && state) {
+    verifyAppliedPatches({ appPath, patchDir, state })
+  }
+
+  if (
+    mode.type === "overwrite_last" &&
+    isRebasing &&
+    state?.patches.length === 0
+  ) {
+    mode = { type: "append", name: "initial" }
+  }
+
+  const existingPatches =
+    getGroupedPatches(patchDir).pathSpecifierToPatchFiles[
+      packageDetails.pathSpecifier
+    ] || []
+
+  // apply all existing patches if appending
+  // otherwise apply all but the last
+  const previouslyAppliedPatches = state?.patches.filter((p) => p.didApply)
+  const patchesToApplyBeforeDiffing: PatchedPackageDetails[] = isRebasing
+    ? mode.type === "append"
+      ? existingPatches.slice(0, previouslyAppliedPatches!.length)
+      : state!.patches[state!.patches.length - 1].didApply
+      ? existingPatches.slice(0, previouslyAppliedPatches!.length - 1)
+      : existingPatches.slice(0, previouslyAppliedPatches!.length)
+    : mode.type === "append"
+    ? existingPatches
+    : existingPatches.slice(0, -1)
+
+  if (createIssue && mode.type === "append") {
+    console.log("--create-issue is not compatible with --append.")
+    process.exit(1)
+  }
+
+  if (createIssue && isRebasing) {
+    console.log("--create-issue is not compatible with rebasing.")
+    process.exit(1)
+  }
+
+  const numPatchesAfterCreate =
+    mode.type === "append" || existingPatches.length === 0
+      ? existingPatches.length + 1
+      : existingPatches.length
+  const vcs = getPackageVCSDetails(packageDetails)
+  const canCreateIssue =
+    !isRebasing &&
+    shouldRecommendIssue(vcs) &&
+    numPatchesAfterCreate === 1 &&
+    mode.type !== "append"
+
   const appPackageJson = require(join(appPath, "package.json"))
   const packagePath = join(appPath, packageDetails.path)
   const packageJsonPath = join(packagePath, "package.json")
@@ -110,15 +190,15 @@ export function makePatch({
       join(resolve(packageDetails.path), "package.json"),
     )
 
-      // copy .npmrc/.yarnrc in case packages are hosted in private registry
-      // copy .yarn directory as well to ensure installations work in yarn 2
-      // tslint:disable-next-line:align
-      ;[".npmrc", ".yarnrc", ".yarn"].forEach((rcFile) => {
-        const rcPath = join(appPath, rcFile)
-        if (existsSync(rcPath)) {
-          copySync(rcPath, join(tmpRepo.name, rcFile), { dereference: true })
-        }
-      })
+    // copy .npmrc/.yarnrc in case packages are hosted in private registry
+    // copy .yarn directory as well to ensure installations work in yarn 2
+    // tslint:disable-next-line:align
+    ;[".npmrc", ".yarnrc", ".yarn"].forEach((rcFile) => {
+      const rcPath = join(appPath, rcFile)
+      if (existsSync(rcPath)) {
+        copySync(rcPath, join(tmpRepo.name, rcFile), { dereference: true })
+      }
+    })
 
     if (packageManager === "yarn") {
       console.info(
@@ -134,7 +214,7 @@ export function makePatch({
         })
       } catch (e) {
         // try again while ignoring scripts in case the script depends on
-        // an implicit context which we havn't reproduced
+        // an implicit context which we haven't reproduced
         spawnSafeSync(
           `yarn`,
           ["install", "--ignore-engines", "--ignore-scripts"],
@@ -158,7 +238,7 @@ export function makePatch({
         })
       } catch (e) {
         // try again while ignoring scripts in case the script depends on
-        // an implicit context which we havn't reproduced
+        // an implicit context which we haven't reproduced
         spawnSafeSync(`npm`, ["i", "--ignore-scripts", "--force"], {
           cwd: tmpRepoNpmRoot,
           stdio: "ignore",
@@ -177,6 +257,8 @@ export function makePatch({
     rimraf(join(tmpRepoPackagePath, "node_modules"))
     // remove .git just to be safe
     rimraf(join(tmpRepoPackagePath, ".git"))
+    // remove patch-package state file
+    rimraf(join(tmpRepoPackagePath, STATE_FILE_NAME))
 
     // commit the package
     console.info(chalk.grey("•"), "Diffing your files with clean files")
@@ -188,6 +270,24 @@ export function makePatch({
     // remove ignored files first
     removeIgnoredFiles(tmpRepoPackagePath, includePaths, excludePaths)
 
+    for (const patchDetails of patchesToApplyBeforeDiffing) {
+      if (
+        !applyPatch({
+          patchDetails,
+          patchDir,
+          patchFilePath: join(appPath, patchDir, patchDetails.patchFilename),
+          reverse: false,
+          cwd: tmpRepo.name,
+          bestEffort: false,
+        })
+      ) {
+        // TODO: add better error message once --rebase is implemented
+        console.log(
+          `Failed to apply patch ${patchDetails.patchFilename} to ${packageDetails.pathSpecifier}`,
+        )
+        process.exit(1)
+      }
+    }
     git("add", "-f", packageDetails.path)
     git("commit", "--allow-empty", "-m", "init")
 
@@ -201,6 +301,8 @@ export function makePatch({
     rimraf(join(tmpRepoPackagePath, "node_modules"))
     // remove .git just to be safe
     rimraf(join(tmpRepoPackagePath, ".git"))
+    // remove patch-package state file
+    rimraf(join(tmpRepoPackagePath, STATE_FILE_NAME))
 
     // also remove ignored files like before
     removeIgnoredFiles(tmpRepoPackagePath, includePaths, excludePaths)
@@ -216,14 +318,19 @@ export function makePatch({
       "--ignore-space-at-eol",
       "--no-ext-diff",
       "--src-prefix=a/",
-      "--dst-prefix=b/"
+      "--dst-prefix=b/",
     )
 
     if (diffResult.stdout.length === 0) {
-      console.warn(
+      console.log(
         `⁉️  Not creating patch file for package '${packagePathSpecifier}'`,
       )
-      console.warn(`⁉️  There don't appear to be any changes.`)
+      console.log(`⁉️  There don't appear to be any changes.`)
+      if (isRebasing && mode.type === "overwrite_last") {
+        console.log(
+          "\n💡 To remove a patch file, delete it and then reinstall node_modules from scratch.",
+        )
+      }
       process.exit(1)
       return
     }
@@ -234,7 +341,7 @@ export function makePatch({
       if (
         (e as Error).message.includes("Unexpected file mode string: 120000")
       ) {
-        console.error(`
+        console.log(`
 ⛔️ ${chalk.red.bold("ERROR")}
 
   Your changes involve creating symlinks. patch-package does not yet support
@@ -256,7 +363,7 @@ export function makePatch({
             }),
           ),
         )
-        console.error(`
+        console.log(`
 ⛔️ ${chalk.red.bold("ERROR")}
         
   patch-package was unable to read the patch-file made by git. This should not
@@ -280,16 +387,40 @@ export function makePatch({
     }
 
     // maybe delete existing
-    getPatchFiles(patchDir).forEach((filename) => {
-      const deets = getPackageDetailsFromPatchFilename(filename)
-      if (deets && deets.path === packageDetails.path) {
-        unlinkSync(join(patchDir, filename))
+    if (mode.type === "append" && !isRebasing && existingPatches.length === 1) {
+      // if we are appending to an existing patch that doesn't have a sequence number let's rename it
+      const prevPatch = existingPatches[0]
+      if (prevPatch.sequenceNumber === undefined) {
+        const newFileName = createPatchFileName({
+          packageDetails,
+          packageVersion,
+          sequenceNumber: 1,
+          sequenceName: prevPatch.sequenceName ?? "initial",
+        })
+        const oldPath = join(appPath, patchDir, prevPatch.patchFilename)
+        const newPath = join(appPath, patchDir, newFileName)
+        renameSync(oldPath, newPath)
+        prevPatch.sequenceNumber = 1
+        prevPatch.patchFilename = newFileName
+        prevPatch.sequenceName = prevPatch.sequenceName ?? "initial"
       }
-    })
+    }
+
+    const lastPatch = existingPatches[
+      state ? state.patches.length - 1 : existingPatches.length - 1
+    ] as PatchedPackageDetails | undefined
+    const sequenceName =
+      mode.type === "append" ? mode.name : lastPatch?.sequenceName
+    const sequenceNumber =
+      mode.type === "append"
+        ? (lastPatch?.sequenceNumber ?? 0) + 1
+        : lastPatch?.sequenceNumber
 
     const patchFileName = createPatchFileName({
       packageDetails,
       packageVersion,
+      sequenceName,
+      sequenceNumber,
     })
 
     const patchPath = join(patchesDir, patchFileName)
@@ -297,21 +428,123 @@ export function makePatch({
       // scoped package
       mkdirSync(dirname(patchPath))
     }
+
+    // if we are inserting a new patch into a sequence we most likely need to update the sequence numbers
+    if (isRebasing && mode.type === "append") {
+      const patchesToNudge = existingPatches.slice(state!.patches.length)
+      if (sequenceNumber === undefined) {
+        throw new Error("sequenceNumber is undefined while rebasing")
+      }
+      if (
+        patchesToNudge[0]?.sequenceNumber !== undefined &&
+        patchesToNudge[0].sequenceNumber <= sequenceNumber
+      ) {
+        let next = sequenceNumber + 1
+        for (const p of patchesToNudge) {
+          const newName = createPatchFileName({
+            packageDetails,
+            packageVersion,
+            sequenceName: p.sequenceName,
+            sequenceNumber: next++,
+          })
+          console.log(
+            "Renaming",
+            chalk.bold(p.patchFilename),
+            "to",
+            chalk.bold(newName),
+          )
+          const oldPath = join(appPath, patchDir, p.patchFilename)
+          const newPath = join(appPath, patchDir, newName)
+          renameSync(oldPath, newPath)
+        }
+      }
+    }
+
     writeFileSync(patchPath, diffResult.stdout)
     console.log(
       `${chalk.green("✔")} Created file ${join(patchDir, patchFileName)}\n`,
     )
-    if (createIssue) {
-      openIssueCreationLink({
+
+    const prevState: PatchState[] = patchesToApplyBeforeDiffing.map(
+      (p): PatchState => ({
+        patchFilename: p.patchFilename,
+        didApply: true,
+        patchContentHash: hashFile(join(appPath, patchDir, p.patchFilename)),
+      }),
+    )
+    const nextState: PatchState[] = [
+      ...prevState,
+      {
+        patchFilename: patchFileName,
+        didApply: true,
+        patchContentHash: hashFile(patchPath),
+      },
+    ]
+
+    // if any patches come after this one we just made, we should reapply them
+    let didFailWhileFinishingRebase = false
+    if (isRebasing) {
+      const currentPatches = getGroupedPatches(join(appPath, patchDir))
+        .pathSpecifierToPatchFiles[packageDetails.pathSpecifier]
+
+      const previouslyUnappliedPatches = currentPatches.slice(nextState.length)
+      if (previouslyUnappliedPatches.length) {
+        console.log(`Fast forwarding...`)
+        for (const patch of previouslyUnappliedPatches) {
+          const patchFilePath = join(appPath, patchDir, patch.patchFilename)
+          if (
+            !applyPatch({
+              patchDetails: patch,
+              patchDir,
+              patchFilePath,
+              reverse: false,
+              cwd: process.cwd(),
+              bestEffort: false,
+            })
+          ) {
+            didFailWhileFinishingRebase = true
+            logPatchSequenceError({ patchDetails: patch })
+            nextState.push({
+              patchFilename: patch.patchFilename,
+              didApply: false,
+              patchContentHash: hashFile(patchFilePath),
+            })
+            break
+          } else {
+            console.log(`  ${chalk.green("✔")} ${patch.patchFilename}`)
+            nextState.push({
+              patchFilename: patch.patchFilename,
+              didApply: true,
+              patchContentHash: hashFile(patchFilePath),
+            })
+          }
+        }
+      }
+    }
+
+    if (isRebasing || numPatchesAfterCreate > 1) {
+      savePatchApplicationState({
         packageDetails,
-        patchFileContents: diffResult.stdout.toString(),
-        packageVersion,
+        patches: nextState,
+        isRebasing: didFailWhileFinishingRebase,
       })
     } else {
-      maybePrintIssueCreationPrompt(packageDetails, packageManager)
+      clearPatchApplicationState(packageDetails)
+    }
+
+    if (canCreateIssue) {
+      if (createIssue) {
+        openIssueCreationLink({
+          packageDetails,
+          patchFileContents: diffResult.stdout.toString(),
+          packageVersion,
+        })
+      } else {
+        maybePrintIssueCreationPrompt(vcs, packageDetails, packageManager)
+      }
     }
   } catch (e) {
-    console.error(e)
+    console.log(e)
     throw e
   } finally {
     tmpRepo.removeCallback()
@@ -321,13 +554,52 @@ export function makePatch({
 function createPatchFileName({
   packageDetails,
   packageVersion,
+  sequenceNumber,
+  sequenceName,
 }: {
   packageDetails: PackageDetails
   packageVersion: string
+  sequenceNumber?: number
+  sequenceName?: string
 }) {
   const packageNames = packageDetails.packageNames
     .map((name) => name.replace(/\//g, "+"))
     .join("++")
 
-  return `${packageNames}+${packageVersion}.patch`
+  const nameAndVersion = `${packageNames}+${packageVersion}`
+  const num =
+    sequenceNumber === undefined
+      ? ""
+      : `+${sequenceNumber.toString().padStart(3, "0")}`
+  const name = !sequenceName ? "" : `+${sequenceName}`
+
+  return `${nameAndVersion}${num}${name}.patch`
+}
+
+export function logPatchSequenceError({
+  patchDetails,
+}: {
+  patchDetails: PatchedPackageDetails
+}) {
+  console.log(`
+${chalk.red.bold("⛔ ERROR")}
+
+Failed to apply patch file ${chalk.bold(patchDetails.patchFilename)}.
+
+If this patch file is no longer useful, delete it and run
+
+  ${chalk.bold(`patch-package`)}
+
+To partially apply the patch (if possible) and output a log of errors to fix, run
+
+  ${chalk.bold(`patch-package --partial`)}
+
+After which you should make any required changes inside ${
+    patchDetails.path
+  }, and finally run
+
+  ${chalk.bold(`patch-package ${patchDetails.pathSpecifier}`)}
+
+to update the patch file.
+`)
 }
diff --git a/src/makeRegExp.ts b/src/makeRegExp.ts
index 3b3a080c..a64825ff 100644
--- a/src/makeRegExp.ts
+++ b/src/makeRegExp.ts
@@ -12,7 +12,7 @@ export const makeRegExp = (
     try {
       return new RegExp(reString, caseSensitive ? "" : "i")
     } catch (_) {
-      console.error(`${chalk.red.bold("***ERROR***")}
+      console.log(`${chalk.red.bold("***ERROR***")}
 Invalid format for option --${name}
 
   Unable to convert the string ${JSON.stringify(
diff --git a/src/packageIsDevDependency.test.ts b/src/packageIsDevDependency.test.ts
index 8f3776c5..82665916 100644
--- a/src/packageIsDevDependency.test.ts
+++ b/src/packageIsDevDependency.test.ts
@@ -11,7 +11,7 @@ describe(packageIsDevDependency, () => {
     expect(
       packageIsDevDependency({
         appPath,
-        packageDetails: getPackageDetailsFromPatchFilename(
+        patchDetails: getPackageDetailsFromPatchFilename(
           "typescript+3.0.1.patch",
         )!,
       }),
@@ -21,9 +21,7 @@ describe(packageIsDevDependency, () => {
     expect(
       packageIsDevDependency({
         appPath,
-        packageDetails: getPackageDetailsFromPatchFilename(
-          "chalk+3.0.1.patch",
-        )!,
+        patchDetails: getPackageDetailsFromPatchFilename("chalk+3.0.1.patch")!,
       }),
     ).toBe(false)
   })
@@ -32,7 +30,7 @@ describe(packageIsDevDependency, () => {
     expect(
       packageIsDevDependency({
         appPath,
-        packageDetails: getPackageDetailsFromPatchFilename(
+        patchDetails: getPackageDetailsFromPatchFilename(
           // cosmiconfig is a transitive dep of lint-staged
           "cosmiconfig+3.0.1.patch",
         )!,
diff --git a/src/packageIsDevDependency.ts b/src/packageIsDevDependency.ts
index 2719c9be..d890ab6a 100644
--- a/src/packageIsDevDependency.ts
+++ b/src/packageIsDevDependency.ts
@@ -4,15 +4,17 @@ import { existsSync } from "fs"
 
 export function packageIsDevDependency({
   appPath,
-  packageDetails,
+  patchDetails,
 }: {
   appPath: string
-  packageDetails: PatchedPackageDetails
+  patchDetails: PatchedPackageDetails
 }) {
   const packageJsonPath = join(appPath, "package.json")
   if (!existsSync(packageJsonPath)) {
     return false
   }
   const { devDependencies } = require(packageJsonPath)
-  return Boolean(devDependencies && devDependencies[packageDetails.packageNames[0]])
+  return Boolean(
+    devDependencies && devDependencies[patchDetails.packageNames[0]],
+  )
 }
diff --git a/src/patch/__snapshots__/parse.test.ts.snap b/src/patch/__snapshots__/parse.test.ts.snap
index afd7fc42..01239a6f 100644
--- a/src/patch/__snapshots__/parse.test.ts.snap
+++ b/src/patch/__snapshots__/parse.test.ts.snap
@@ -102,6 +102,22 @@ Array [
             "type": "context",
           },
         ],
+        "source": "@@ -41,10 +41,11 @@ function assertValidName(name) {
+  */
+ function isValidNameError(name, node) {
+   !(typeof name === 'string') ? (0, _invariant2.default)(0, 'Expected string') : void 0;
+-  if (name.length > 1 && name[0] === '_' && name[1] === '_') {
+-    return new _GraphQLError.GraphQLError('Name \\"' + name + '\\" must not begin with \\"__\\", which is reserved by ' + 'GraphQL introspection.', node);
+-  }
++  // if (name.length > 1 && name[0] === '_' && name[1] === '_') {
++  //   return new _GraphQLError.GraphQLError('Name \\"' + name + '\\" must not begin with \\"__\\", which is reserved by ' + 'GraphQL introspection.', node);
++  // }
+   if (!NAME_RX.test(name)) {
+     return new _GraphQLError.GraphQLError('Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but \\"' + name + '\\" does not.', node);
+   }
++
+ }
+\\\\ No newline at end of file",
       },
     ],
     "path": "node_modules/graphql/utilities/assertValidName.js",
@@ -160,6 +176,19 @@ Array [
             "type": "context",
           },
         ],
+        "source": "@@ -29,9 +29,9 @@ export function assertValidName(name) {
+  */
+ export function isValidNameError(name, node) {
+   !(typeof name === 'string') ? invariant(0, 'Expected string') : void 0;
+-  if (name.length > 1 && name[0] === '_' && name[1] === '_') {
+-    return new GraphQLError('Name \\"' + name + '\\" must not begin with \\"__\\", which is reserved by ' + 'GraphQL introspection.', node);
+-  }
++  // if (name.length > 1 && name[0] === '_' && name[1] === '_') {
++  //   return new GraphQLError('Name \\"' + name + '\\" must not begin with \\"__\\", which is reserved by ' + 'GraphQL introspection.', node);
++  // }
+   if (!NAME_RX.test(name)) {
+     return new GraphQLError('Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but \\"' + name + '\\" does not.', node);
+   }",
       },
     ],
     "path": "node_modules/graphql/utilities/assertValidName.mjs",
diff --git a/src/patch/apply.ts b/src/patch/apply.ts
index c2601bae..afb6c67a 100644
--- a/src/patch/apply.ts
+++ b/src/patch/apply.ts
@@ -1,43 +1,71 @@
 import fs from "fs-extra"
-import { dirname } from "path"
+import { dirname, join, relative, resolve } from "path"
 import { ParsedPatchFile, FilePatch, Hunk } from "./parse"
 import { assertNever } from "../assertNever"
 
 export const executeEffects = (
   effects: ParsedPatchFile,
-  { dryRun }: { dryRun: boolean },
+  {
+    dryRun,
+    bestEffort,
+    errors,
+    cwd,
+  }: { dryRun: boolean; cwd?: string; errors?: string[]; bestEffort: boolean },
 ) => {
-  effects.forEach(eff => {
+  const inCwd = (path: string) => (cwd ? join(cwd, path) : path)
+  const humanReadable = (path: string) => relative(process.cwd(), inCwd(path))
+  effects.forEach((eff) => {
     switch (eff.type) {
       case "file deletion":
         if (dryRun) {
-          if (!fs.existsSync(eff.path)) {
+          if (!fs.existsSync(inCwd(eff.path))) {
             throw new Error(
-              "Trying to delete file that doesn't exist: " + eff.path,
+              "Trying to delete file that doesn't exist: " +
+                humanReadable(eff.path),
             )
           }
         } else {
           // TODO: integrity checks
-          fs.unlinkSync(eff.path)
+          try {
+            fs.unlinkSync(inCwd(eff.path))
+          } catch (e) {
+            if (bestEffort) {
+              errors?.push(`Failed to delete file ${eff.path}`)
+            } else {
+              throw e
+            }
+          }
         }
         break
       case "rename":
         if (dryRun) {
           // TODO: see what patch files look like if moving to exising path
-          if (!fs.existsSync(eff.fromPath)) {
+          if (!fs.existsSync(inCwd(eff.fromPath))) {
             throw new Error(
-              "Trying to move file that doesn't exist: " + eff.fromPath,
+              "Trying to move file that doesn't exist: " +
+                humanReadable(eff.fromPath),
             )
           }
         } else {
-          fs.moveSync(eff.fromPath, eff.toPath)
+          try {
+            fs.moveSync(inCwd(eff.fromPath), inCwd(eff.toPath))
+          } catch (e) {
+            if (bestEffort) {
+              errors?.push(
+                `Failed to rename file ${eff.fromPath} to ${eff.toPath}`,
+              )
+            } else {
+              throw e
+            }
+          }
         }
         break
       case "file creation":
         if (dryRun) {
-          if (fs.existsSync(eff.path)) {
+          if (fs.existsSync(inCwd(eff.path))) {
             throw new Error(
-              "Trying to create file that already exists: " + eff.path,
+              "Trying to create file that already exists: " +
+                humanReadable(eff.path),
             )
           }
           // todo: check file contents matches
@@ -46,23 +74,34 @@ export const executeEffects = (
             ? eff.hunk.parts[0].lines.join("\n") +
               (eff.hunk.parts[0].noNewlineAtEndOfFile ? "" : "\n")
             : ""
-          fs.ensureDirSync(dirname(eff.path))
-          fs.writeFileSync(eff.path, fileContents, { mode: eff.mode })
+          const path = inCwd(eff.path)
+          try {
+            fs.ensureDirSync(dirname(path))
+            fs.writeFileSync(path, fileContents, { mode: eff.mode })
+          } catch (e) {
+            if (bestEffort) {
+              errors?.push(`Failed to create new file ${eff.path}`)
+            } else {
+              throw e
+            }
+          }
         }
         break
       case "patch":
-        applyPatch(eff, { dryRun })
+        applyPatch(eff, { dryRun, cwd, bestEffort, errors })
         break
       case "mode change":
-        const currentMode = fs.statSync(eff.path).mode
+        const currentMode = fs.statSync(inCwd(eff.path)).mode
         if (
           ((isExecutable(eff.newMode) && isExecutable(currentMode)) ||
             (!isExecutable(eff.newMode) && !isExecutable(currentMode))) &&
           dryRun
         ) {
-          console.warn(`Mode change is not required for file ${eff.path}`)
+          console.log(
+            `Mode change is not required for file ${humanReadable(eff.path)}`,
+          )
         }
-        fs.chmodSync(eff.path, eff.newMode)
+        fs.chmodSync(inCwd(eff.path), eff.newMode)
         break
       default:
         assertNever(eff)
@@ -104,15 +143,21 @@ function linesAreEqual(a: string, b: string) {
 
 function applyPatch(
   { hunks, path }: FilePatch,
-  { dryRun }: { dryRun: boolean },
+  {
+    dryRun,
+    cwd,
+    bestEffort,
+    errors,
+  }: { dryRun: boolean; cwd?: string; bestEffort: boolean; errors?: string[] },
 ): void {
+  path = cwd ? resolve(cwd, path) : path
   // modifying the file in place
   const fileContents = fs.readFileSync(path).toString()
   const mode = fs.statSync(path).mode
 
   const fileLines: string[] = fileContents.split(/\n/)
 
-  const result: Modificaiton[][] = []
+  const result: Modification[][] = []
 
   for (const hunk of hunks) {
     let fuzzingOffset = 0
@@ -127,9 +172,18 @@ function applyPatch(
         fuzzingOffset < 0 ? fuzzingOffset * -1 : fuzzingOffset * -1 - 1
 
       if (Math.abs(fuzzingOffset) > 20) {
-        throw new Error(
-          `Cant apply hunk ${hunks.indexOf(hunk)} for file ${path}`,
-        )
+        const message = `Cannot apply hunk ${hunks.indexOf(
+          hunk,
+        )} for file ${relative(process.cwd(), path)}\n\`\`\`diff\n${
+          hunk.source
+        }\n\`\`\`\n`
+
+        if (bestEffort) {
+          errors?.push(message)
+          break
+        } else {
+          throw new Error(message)
+        }
       }
     }
   }
@@ -164,7 +218,15 @@ function applyPatch(
     }
   }
 
-  fs.writeFileSync(path, fileLines.join("\n"), { mode })
+  try {
+    fs.writeFileSync(path, fileLines.join("\n"), { mode })
+  } catch (e) {
+    if (bestEffort) {
+      errors?.push(`Failed to write file ${path}`)
+    } else {
+      throw e
+    }
+  }
 }
 
 interface Push {
@@ -181,14 +243,14 @@ interface Splice {
   linesToInsert: string[]
 }
 
-type Modificaiton = Push | Pop | Splice
+type Modification = Push | Pop | Splice
 
 function evaluateHunk(
   hunk: Hunk,
   fileLines: string[],
   fuzzingOffset: number,
-): Modificaiton[] | null {
-  const result: Modificaiton[] = []
+): Modification[] | null {
+  const result: Modification[] = []
   let contextIndex = hunk.header.original.start - 1 + fuzzingOffset
   // do bounds checks for index
   if (contextIndex < 0) {
diff --git a/src/patch/parse.ts b/src/patch/parse.ts
index 8505d754..d0dfa35e 100644
--- a/src/patch/parse.ts
+++ b/src/patch/parse.ts
@@ -109,6 +109,7 @@ interface FileDeets {
 export interface Hunk {
   header: HunkHeader
   parts: PatchMutationPart[]
+  source: string
 }
 
 const emptyFilePatch = (): FileDeets => ({
@@ -130,6 +131,7 @@ const emptyFilePatch = (): FileDeets => ({
 const emptyHunk = (headerLine: string): Hunk => ({
   header: parseHunkHeaderLine(headerLine),
   parts: [],
+  source: "",
 })
 
 const hunkLinetypes: {
@@ -154,20 +156,22 @@ function parsePatchLines(
   let state: State = "parsing header"
   let currentHunk: Hunk | null = null
   let currentHunkMutationPart: PatchMutationPart | null = null
+  let hunkStartLineIndex = 0
 
-  function commitHunk() {
+  function commitHunk(i: number) {
     if (currentHunk) {
       if (currentHunkMutationPart) {
         currentHunk.parts.push(currentHunkMutationPart)
         currentHunkMutationPart = null
       }
+      currentHunk.source = lines.slice(hunkStartLineIndex, i).join("\n")
       currentFilePatch.hunks!.push(currentHunk)
       currentHunk = null
     }
   }
 
-  function commitFilePatch() {
-    commitHunk()
+  function commitFilePatch(i: number) {
+    commitHunk(i)
     result.push(currentFilePatch)
     currentFilePatch = emptyFilePatch()
   }
@@ -177,12 +181,13 @@ function parsePatchLines(
 
     if (state === "parsing header") {
       if (line.startsWith("@@")) {
+        hunkStartLineIndex = i
         state = "parsing hunks"
         currentFilePatch.hunks = []
         i--
       } else if (line.startsWith("diff --git ")) {
         if (currentFilePatch && currentFilePatch.diffLineFromPath) {
-          commitFilePatch()
+          commitFilePatch(i)
         }
         const match = line.match(/^diff --git a\/(.*?) b\/(.*?)\s*$/)
         if (!match) {
@@ -221,7 +226,7 @@ function parsePatchLines(
     } else {
       if (supportLegacyDiffs && line.startsWith("--- a/")) {
         state = "parsing header"
-        commitFilePatch()
+        commitFilePatch(i)
         i--
         continue
       }
@@ -229,13 +234,13 @@ function parsePatchLines(
       const lineType = hunkLinetypes[line[0]] || null
       switch (lineType) {
         case "header":
-          commitHunk()
+          commitHunk(i)
           currentHunk = emptyHunk(line)
           break
         case null:
           // unrecognized, bail out
           state = "parsing header"
-          commitFilePatch()
+          commitFilePatch(i)
           i--
           break
         case "pragma":
@@ -280,7 +285,7 @@ function parsePatchLines(
     }
   }
 
-  commitFilePatch()
+  commitFilePatch(lines.length)
 
   for (const { hunks } of result) {
     if (hunks) {
diff --git a/src/patch/read.test.ts b/src/patch/read.test.ts
index 327bb980..1ea4ef92 100644
--- a/src/patch/read.test.ts
+++ b/src/patch/read.test.ts
@@ -16,23 +16,25 @@ jest.mock("./parse", () => ({
   }),
 }))
 
-const error = jest.fn()
-console.error = error
+const log = jest.fn()
+console.log = log
 process.cwd = jest.fn(() => "/test/root")
 process.exit = jest.fn() as any
 
+const lastLog = () => log.mock.calls[log.mock.calls.length - 1][0]
+
 describe(readPatch, () => {
   beforeEach(() => {
-    error.mockReset()
+    log.mockReset()
   })
   it("throws an error for basic packages", () => {
     readPatch({
       patchFilePath: "/test/root/patches/test+1.2.3.patch",
-      packageDetails: getPackageDetailsFromPatchFilename("test+1.2.3.patch")!,
+      patchDetails: getPackageDetailsFromPatchFilename("test+1.2.3.patch")!,
       patchDir: "patches/",
     })
 
-    expect(removeAnsiCodes(error.mock.calls[0][0])).toMatchInlineSnapshot(`
+    expect(removeAnsiCodes(lastLog())).toMatchInlineSnapshot(`
 "
 **ERROR** Failed to apply patch for package test
     
@@ -56,13 +58,13 @@ describe(readPatch, () => {
   it("throws an error for scoped packages", () => {
     readPatch({
       patchFilePath: "/test/root/patches/@david+test+1.2.3.patch",
-      packageDetails: getPackageDetailsFromPatchFilename(
+      patchDetails: getPackageDetailsFromPatchFilename(
         "@david+test+1.2.3.patch",
       )!,
       patchDir: "patches/",
     })
 
-    expect(removeAnsiCodes(error.mock.calls[0][0])).toMatchInlineSnapshot(`
+    expect(removeAnsiCodes(lastLog())).toMatchInlineSnapshot(`
 "
 **ERROR** Failed to apply patch for package @david/test
     
@@ -87,11 +89,11 @@ describe(readPatch, () => {
     const patchFileName = "@david+test++react-native+1.2.3.patch"
     readPatch({
       patchFilePath: `/test/root/patches/${patchFileName}`,
-      packageDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
+      patchDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
       patchDir: "patches/",
     })
 
-    expect(removeAnsiCodes(error.mock.calls[0][0])).toMatchInlineSnapshot(`
+    expect(removeAnsiCodes(lastLog())).toMatchInlineSnapshot(`
 "
 **ERROR** Failed to apply patch for package @david/test => react-native
     
@@ -116,11 +118,11 @@ describe(readPatch, () => {
     const patchFileName = "@david+test++react-native+1.2.3.patch"
     readPatch({
       patchFilePath: `/test/root/.cruft/patches/${patchFileName}`,
-      packageDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
+      patchDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
       patchDir: ".cruft/patches",
     })
 
-    expect(removeAnsiCodes(error.mock.calls[0][0])).toMatchInlineSnapshot(`
+    expect(removeAnsiCodes(lastLog())).toMatchInlineSnapshot(`
 "
 **ERROR** Failed to apply patch for package @david/test => react-native
     
@@ -145,13 +147,13 @@ describe(readPatch, () => {
     const patchFileName = "@david+test++react-native+1.2.3.patch"
     readPatch({
       patchFilePath: `/test/root/packages/banana/patches/${patchFileName}`,
-      packageDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
+      patchDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
       patchDir: "patches/",
     })
 
     expect(process.cwd).toHaveBeenCalled()
 
-    expect(removeAnsiCodes(error.mock.calls[0][0])).toMatchInlineSnapshot(`
+    expect(removeAnsiCodes(lastLog())).toMatchInlineSnapshot(`
 "
 **ERROR** Failed to apply patch for package @david/test => react-native
     
@@ -178,13 +180,13 @@ describe(readPatch, () => {
     const patchFileName = "@david+test++react-native+1.2.3.patch"
     readPatch({
       patchFilePath: `/test/root/packages/banana/.patches/${patchFileName}`,
-      packageDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
+      patchDetails: getPackageDetailsFromPatchFilename(patchFileName)!,
       patchDir: ".patches/",
     })
 
     expect(process.cwd).toHaveBeenCalled()
 
-    expect(removeAnsiCodes(error.mock.calls[0][0])).toMatchInlineSnapshot(`
+    expect(removeAnsiCodes(lastLog())).toMatchInlineSnapshot(`
 "
 **ERROR** Failed to apply patch for package @david/test => react-native
     
diff --git a/src/patch/read.ts b/src/patch/read.ts
index 632cdd63..3d8380ac 100644
--- a/src/patch/read.ts
+++ b/src/patch/read.ts
@@ -7,11 +7,11 @@ import { parsePatchFile, PatchFilePart } from "./parse"
 
 export function readPatch({
   patchFilePath,
-  packageDetails,
+  patchDetails,
   patchDir,
 }: {
   patchFilePath: string
-  packageDetails: PackageDetails
+  patchDetails: PackageDetails
   patchDir: string
 }): PatchFilePart[] {
   try {
@@ -33,17 +33,17 @@ export function readPatch({
         relativePatchFilePath.indexOf(patchDir),
       )}`,
     )
-    fixupSteps.push(`npx patch-package ${packageDetails.pathSpecifier}`)
+    fixupSteps.push(`npx patch-package ${patchDetails.pathSpecifier}`)
     if (patchBaseDir) {
       fixupSteps.push(
         `cd ${relative(resolve(process.cwd(), patchBaseDir), process.cwd())}`,
       )
     }
 
-    console.error(`
+    console.log(`
 ${chalk.red.bold("**ERROR**")} ${chalk.red(
       `Failed to apply patch for package ${chalk.bold(
-        packageDetails.humanReadablePathSpecifier,
+        patchDetails.humanReadablePathSpecifier,
       )}`,
     )}
     
diff --git a/src/patch/reverse.ts b/src/patch/reverse.ts
index bbc35f20..45c1a6f6 100644
--- a/src/patch/reverse.ts
+++ b/src/patch/reverse.ts
@@ -51,6 +51,7 @@ function reverseHunk(hunk: Hunk): Hunk {
   const result: Hunk = {
     header,
     parts,
+    source: hunk.source,
   }
 
   verifyHunkIntegrity(result)
diff --git a/src/patchFs.ts b/src/patchFs.ts
index 9786365e..a4241cc1 100644
--- a/src/patchFs.ts
+++ b/src/patchFs.ts
@@ -1,3 +1,7 @@
+import {
+  PatchedPackageDetails,
+  getPackageDetailsFromPatchFilename,
+} from "./PackageDetails"
 import { relative } from "./path"
 import klawSync from "klaw-sync"
 
@@ -5,8 +9,51 @@ export const getPatchFiles = (patchesDir: string) => {
   try {
     return klawSync(patchesDir, { nodir: true })
       .map(({ path }) => relative(patchesDir, path))
-      .filter(path => path.endsWith(".patch"))
+      .filter((path) => path.endsWith(".patch"))
   } catch (e) {
     return []
   }
 }
+
+interface GroupedPatches {
+  numPatchFiles: number
+  pathSpecifierToPatchFiles: Record<string, PatchedPackageDetails[]>
+  warnings: string[]
+}
+export const getGroupedPatches = (patchesDirectory: string): GroupedPatches => {
+  const files = getPatchFiles(patchesDirectory)
+
+  if (files.length === 0) {
+    return {
+      numPatchFiles: 0,
+      pathSpecifierToPatchFiles: {},
+      warnings: [],
+    }
+  }
+
+  const warnings: string[] = []
+
+  const pathSpecifierToPatchFiles: Record<string, PatchedPackageDetails[]> = {}
+  for (const file of files) {
+    const details = getPackageDetailsFromPatchFilename(file)
+    if (!details) {
+      warnings.push(`Unrecognized patch file in patches directory ${file}`)
+      continue
+    }
+    if (!pathSpecifierToPatchFiles[details.pathSpecifier]) {
+      pathSpecifierToPatchFiles[details.pathSpecifier] = []
+    }
+    pathSpecifierToPatchFiles[details.pathSpecifier].push(details)
+  }
+  for (const arr of Object.values(pathSpecifierToPatchFiles)) {
+    arr.sort((a, b) => {
+      return (a.sequenceNumber ?? 0) - (b.sequenceNumber ?? 0)
+    })
+  }
+
+  return {
+    numPatchFiles: files.length,
+    pathSpecifierToPatchFiles,
+    warnings,
+  }
+}
diff --git a/src/rebase.ts b/src/rebase.ts
new file mode 100644
index 00000000..d8f0ba9c
--- /dev/null
+++ b/src/rebase.ts
@@ -0,0 +1,224 @@
+import chalk from "chalk"
+import { join, resolve } from "path"
+import { applyPatch } from "./applyPatches"
+import { hashFile } from "./hash"
+import { PatchedPackageDetails } from "./PackageDetails"
+import { getGroupedPatches } from "./patchFs"
+import {
+  getPatchApplicationState,
+  savePatchApplicationState,
+  verifyAppliedPatches,
+} from "./stateFile"
+
+export function rebase({
+  appPath,
+  patchDir,
+  packagePathSpecifier,
+  targetPatch,
+}: {
+  appPath: string
+  patchDir: string
+  packagePathSpecifier: string
+  targetPatch: string
+}): void {
+  const patchesDirectory = join(appPath, patchDir)
+  const groupedPatches = getGroupedPatches(patchesDirectory)
+
+  if (groupedPatches.numPatchFiles === 0) {
+    console.log(chalk.blueBright("No patch files found"))
+    process.exit(1)
+  }
+
+  const packagePatches =
+    groupedPatches.pathSpecifierToPatchFiles[packagePathSpecifier]
+  if (!packagePatches) {
+    console.log(
+      chalk.blueBright("No patch files found for package"),
+      packagePathSpecifier,
+    )
+    process.exit(1)
+  }
+
+  const state = getPatchApplicationState(packagePatches[0])
+
+  if (!state) {
+    console.log(
+      chalk.blueBright("No patch state found"),
+      "Did you forget to run",
+      chalk.bold("patch-package"),
+      "(without arguments) first?",
+    )
+    process.exit(1)
+  }
+  if (state.isRebasing) {
+    console.log(
+      chalk.blueBright("Already rebasing"),
+      "Make changes to the files in",
+      chalk.bold(packagePatches[0].path),
+      "and then run `patch-package",
+      packagePathSpecifier,
+      "--continue` to",
+      packagePatches.length === state.patches.length
+        ? "append a patch file"
+        : `update the ${
+            packagePatches[packagePatches.length - 1].patchFilename
+          } file`,
+    )
+    console.log(
+      `💡 To remove a broken patch file, delete it and reinstall node_modules`,
+    )
+    process.exit(1)
+  }
+  if (state.patches.length !== packagePatches.length) {
+    console.log(
+      chalk.blueBright("Some patches have not been applied."),
+      "Reinstall node_modules and try again.",
+    )
+  }
+  // check hashes
+  verifyAppliedPatches({ appPath, patchDir, state })
+
+  if (targetPatch === "0") {
+    // unapply all
+    unApplyPatches({
+      patches: packagePatches,
+      appPath,
+      patchDir,
+    })
+    savePatchApplicationState({
+      packageDetails: packagePatches[0],
+      isRebasing: true,
+      patches: [],
+    })
+    console.log(`
+Make any changes you need inside ${chalk.bold(packagePatches[0].path)}
+
+When you are done, run
+
+  ${chalk.bold(
+    `patch-package ${packagePathSpecifier} --append 'MyChangeDescription'`,
+  )}
+  
+to insert a new patch file.
+`)
+    return
+  }
+
+  // find target patch
+  const target = packagePatches.find((p) => {
+    if (p.patchFilename === targetPatch) {
+      return true
+    }
+    if (
+      resolve(process.cwd(), targetPatch) ===
+      join(patchesDirectory, p.patchFilename)
+    ) {
+      return true
+    }
+
+    if (targetPatch === p.sequenceName) {
+      return true
+    }
+    const n = Number(targetPatch.replace(/^0+/g, ""))
+    if (!isNaN(n) && n === p.sequenceNumber) {
+      return true
+    }
+    return false
+  })
+
+  if (!target) {
+    console.log(
+      chalk.red("Could not find target patch file"),
+      chalk.bold(targetPatch),
+    )
+    console.log()
+    console.log("The list of available patch files is:")
+    packagePatches.forEach((p) => {
+      console.log(`  - ${p.patchFilename}`)
+    })
+
+    process.exit(1)
+  }
+  const currentHash = hashFile(join(patchesDirectory, target.patchFilename))
+
+  const prevApplication = state.patches.find(
+    (p) => p.patchContentHash === currentHash,
+  )
+  if (!prevApplication) {
+    console.log(
+      chalk.red("Could not find previous application of patch file"),
+      chalk.bold(target.patchFilename),
+    )
+    console.log()
+    console.log("You should reinstall node_modules and try again.")
+    process.exit(1)
+  }
+
+  // ok, we are good to start undoing all the patches that were applied up to but not including the target patch
+  const targetIdx = state.patches.indexOf(prevApplication)
+
+  unApplyPatches({
+    patches: packagePatches.slice(targetIdx + 1),
+    appPath,
+    patchDir,
+  })
+  savePatchApplicationState({
+    packageDetails: packagePatches[0],
+    isRebasing: true,
+    patches: packagePatches.slice(0, targetIdx + 1).map((p) => ({
+      patchFilename: p.patchFilename,
+      patchContentHash: hashFile(join(patchesDirectory, p.patchFilename)),
+      didApply: true,
+    })),
+  })
+
+  console.log(`
+Make any changes you need inside ${chalk.bold(packagePatches[0].path)}
+
+When you are done, do one of the following:
+
+  To update ${chalk.bold(packagePatches[targetIdx].patchFilename)} run
+
+    ${chalk.bold(`patch-package ${packagePathSpecifier}`)}
+    
+  To create a new patch file after ${chalk.bold(
+    packagePatches[targetIdx].patchFilename,
+  )} run
+  
+    ${chalk.bold(
+      `patch-package ${packagePathSpecifier} --append 'MyChangeDescription'`,
+    )}
+
+  `)
+}
+
+function unApplyPatches({
+  patches,
+  appPath,
+  patchDir,
+}: {
+  patches: PatchedPackageDetails[]
+  appPath: string
+  patchDir: string
+}) {
+  for (const patch of patches.slice().reverse()) {
+    if (
+      !applyPatch({
+        patchFilePath: join(appPath, patchDir, patch.patchFilename) as string,
+        reverse: true,
+        patchDetails: patch,
+        patchDir,
+        cwd: process.cwd(),
+        bestEffort: false,
+      })
+    ) {
+      console.log(
+        chalk.red("Failed to un-apply patch file"),
+        chalk.bold(patch.patchFilename),
+        "Try completely reinstalling node_modules.",
+      )
+      process.exit(1)
+    }
+    console.log(chalk.cyan.bold("Un-applied"), patch.patchFilename)
+  }
+}
diff --git a/src/spawnSafe.ts b/src/spawnSafe.ts
index 3ea042f7..5278d121 100644
--- a/src/spawnSafe.ts
+++ b/src/spawnSafe.ts
@@ -1,35 +1,35 @@
-import { sync as spawnSync } from "cross-spawn"
-import { SpawnOptions } from "child_process"
-
-export interface SpawnSafeOptions extends SpawnOptions {
-  throwOnError?: boolean
-  logStdErrOnError?: boolean
-  maxBuffer?: number
-}
-
-const defaultOptions: SpawnSafeOptions = {
-  logStdErrOnError: true,
-  throwOnError: true,
-}
-
-export const spawnSafeSync = (
-  command: string,
-  args?: string[],
-  options?: SpawnSafeOptions,
-) => {
-  const mergedOptions = Object.assign({}, defaultOptions, options)
-  const result = spawnSync(command, args, options)
-  if (result.error || result.status !== 0) {
-    if (mergedOptions.logStdErrOnError) {
-      if (result.stderr) {
-        console.error(result.stderr.toString())
-      } else if (result.error) {
-        console.error(result.error)
-      }
-    }
-    if (mergedOptions.throwOnError) {
-      throw result
-    }
-  }
-  return result
-}
+import { sync as spawnSync } from "cross-spawn"
+import { SpawnOptions } from "child_process"
+
+export interface SpawnSafeOptions extends SpawnOptions {
+  throwOnError?: boolean
+  logStdErrOnError?: boolean
+  maxBuffer?: number
+}
+
+const defaultOptions: SpawnSafeOptions = {
+  logStdErrOnError: true,
+  throwOnError: true,
+}
+
+export const spawnSafeSync = (
+  command: string,
+  args?: string[],
+  options?: SpawnSafeOptions,
+) => {
+  const mergedOptions = Object.assign({}, defaultOptions, options)
+  const result = spawnSync(command, args, options)
+  if (result.error || result.status !== 0) {
+    if (mergedOptions.logStdErrOnError) {
+      if (result.stderr) {
+        console.log(result.stderr.toString())
+      } else if (result.error) {
+        console.log(result.error)
+      }
+    }
+    if (mergedOptions.throwOnError) {
+      throw result
+    }
+  }
+  return result
+}
diff --git a/src/stateFile.ts b/src/stateFile.ts
new file mode 100644
index 00000000..7aea576d
--- /dev/null
+++ b/src/stateFile.ts
@@ -0,0 +1,107 @@
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs"
+import { join } from "path"
+import { PackageDetails } from "./PackageDetails"
+import stringify from "json-stable-stringify"
+import { hashFile } from "./hash"
+import chalk from "chalk"
+export interface PatchState {
+  patchFilename: string
+  patchContentHash: string
+  didApply: boolean
+}
+
+const version = 1
+export interface PatchApplicationState {
+  version: number
+  patches: PatchState[]
+  isRebasing: boolean
+}
+
+export const STATE_FILE_NAME = ".patch-package.json"
+
+export function getPatchApplicationState(
+  packageDetails: PackageDetails,
+): PatchApplicationState | null {
+  const fileName = join(packageDetails.path, STATE_FILE_NAME)
+
+  let state: null | PatchApplicationState = null
+  try {
+    state = JSON.parse(readFileSync(fileName, "utf8"))
+  } catch (e) {
+    // noop
+  }
+  if (!state) {
+    return null
+  }
+  if (state.version !== version) {
+    console.log(
+      `You upgraded patch-package and need to fully reinstall node_modules to continue.`,
+    )
+    process.exit(1)
+  }
+  return state
+}
+
+export function savePatchApplicationState({
+  packageDetails,
+  patches,
+  isRebasing,
+}: {
+  packageDetails: PackageDetails
+  patches: PatchState[]
+  isRebasing: boolean
+}) {
+  const fileName = join(packageDetails.path, STATE_FILE_NAME)
+
+  const state: PatchApplicationState = {
+    patches,
+    version,
+    isRebasing,
+  }
+
+  writeFileSync(fileName, stringify(state, { space: 4 }), "utf8")
+}
+
+export function clearPatchApplicationState(packageDetails: PackageDetails) {
+  const fileName = join(packageDetails.path, STATE_FILE_NAME)
+
+  try {
+    unlinkSync(fileName)
+  } catch (e) {
+    // noop
+  }
+}
+
+export function verifyAppliedPatches({
+  appPath,
+  patchDir,
+  state,
+}: {
+  appPath: string
+  patchDir: string
+  state: PatchApplicationState
+}) {
+  const patchesDirectory = join(appPath, patchDir)
+  for (const patch of state.patches) {
+    if (!patch.didApply) {
+      break
+    }
+    const fullPatchPath = join(patchesDirectory, patch.patchFilename)
+    if (!existsSync(fullPatchPath)) {
+      console.log(
+        chalk.blueBright("Expected patch file"),
+        fullPatchPath,
+        "to exist but it is missing. Try removing and reinstalling node_modules first.",
+      )
+      process.exit(1)
+    }
+    if (patch.patchContentHash !== hashFile(fullPatchPath)) {
+      console.log(
+        chalk.blueBright("Patch file"),
+        fullPatchPath,
+        "has changed since it was applied. Try removing and reinstalling node_modules first.",
+      )
+      process.exit(1)
+    }
+  }
+}
diff --git a/tslint.json b/tslint.json
index ea76ddb6..9d5e2bdf 100644
--- a/tslint.json
+++ b/tslint.json
@@ -17,6 +17,7 @@
     "no-trailing-whitespace": [false],
     "object-literal-key-quotes": [false],
     "max-line-length": false,
+    "no-shadowed-variable": false,
     "no-default-export": true
   },
   "rulesDirectory": []
diff --git a/yarn.lock b/yarn.lock
index 4d93e55d..6e3eb9f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -449,6 +449,11 @@
   dependencies:
     "@types/jest-diff" "*"
 
+"@types/json-stable-stringify@^1.0.34":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz#c0fb25e4d957e0ee2e497c1f553d7f8bb668fd75"
+  integrity sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw==
+
 "@types/keyv@*", "@types/keyv@^3.1.1":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7"
@@ -3282,6 +3287,13 @@ json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
 
+json-stable-stringify@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0"
+  integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==
+  dependencies:
+    jsonify "^0.0.1"
+
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -3302,6 +3314,11 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonify@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
+  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
+
 jsprim@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"