Need to reset hard HEAD^

idan · idan · commit f49369ba993e · 2021-04-21T10:20:12.000-07:00
diff --git a/src/main.ts b/src/main.ts
@@ -83,7 +83,7 @@ async function run(): Promise<void> {
       break
     } catch (error) {
       core.info('Retrying because of conflicts...')
-      await exec('git', ['reset', '--hard', 'HEAD'])
+      await exec('git', ['reset', '--hard', 'HEAD^'])
       await exec('git', ['pull'])
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ async function run(): Promise<void> {`
`83`	`83`	`break`
`84`	`84`	`} catch (error) {`
`85`	`85`	`core.info('Retrying because of conflicts...')`
`86`		`- await exec('git', ['reset', '--hard', 'HEAD'])`
	`86`	`+ await exec('git', ['reset', '--hard', 'HEAD^'])`
`87`	`87`	`await exec('git', ['pull'])`
`88`	`88`	`}`
`89`	`89`	`}`