Merge pull request #90 from alexyaroshuk/daily-pr-conflicts

alexyaroshuk · web-flow · commit 5aa9a1ae05d8 · 2026-02-19T21:47:14.000+08:00
fix: skip husky hooks when pushing resolved conflicts
diff --git a/script/test-resolve-pr-conflicts.ts b/script/test-resolve-pr-conflicts.ts
@@ -251,7 +251,7 @@ async function attemptMerge(pr: PR): Promise<{ success: boolean; files: Conflict
 
     if (allResolved && shouldPush) {
       await $`git commit -m "Resolve conflicts with upstream/${pr.baseRefName}"`.quiet()
-      await $`git push origin ${pr.headRefName}`.quiet()
+      await $`git push origin ${pr.headRefName} --no-verify`.quiet()
       console.log(`\n✅ Pushed resolved changes to PR #${pr.number}`)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ async function attemptMerge(pr: PR): Promise<{ success: boolean; files: Conflict`
`251`	`251`
`252`	`252`	`if (allResolved && shouldPush) {`
`253`	`253`	await $`git commit -m "Resolve conflicts with upstream/${pr.baseRefName}"`.quiet()
`254`		- await $`git push origin ${pr.headRefName}`.quiet()
	`254`	+ await $`git push origin ${pr.headRefName} --no-verify`.quiet()
`255`	`255`	console.log(`\n✅ Pushed resolved changes to PR #${pr.number}`)
`256`	`256`	`}`
`257`	`257`