Fixing filestoskip option after merge

VachaShah · VachaShah · commit b3df18ddcfa4 · 2022-10-27T05:00:40.000Z
Signed-off-by: Vacha Shah &lt;vachshah@amazon.com&gt;
diff --git a/src/backport.ts b/src/backport.ts
@@ -105,7 +105,7 @@ const backportOnce = async ({
   await git("switch", base);
   await git("switch", "--create", head);
   try {
-    await git("cherry-pick", "-x", commitSha);
+    await git("cherry-pick", "-x", "-n", commitSha);
     for (const file of filesToSkip) {
       await git("checkout", "HEAD", file);
     }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ const backportOnce = async ({`
`105`	`105`	`await git("switch", base);`
`106`	`106`	`await git("switch", "--create", head);`
`107`	`107`	`try {`
`108`		`- await git("cherry-pick", "-x", commitSha);`
	`108`	`+ await git("cherry-pick", "-x", "-n", commitSha);`
`109`	`109`	`for (const file of filesToSkip) {`
`110`	`110`	`await git("checkout", "HEAD", file);`
`111`	`111`	`}`