sync master and dev, if there are changes

Staffbase · Dec 2, 2021 · 52f7051 · 52f7051
1 parent 9aee599
commit 52f7051
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/autodev.ts b/src/autodev.ts
@@ -28,7 +28,14 @@ const autoDev = async (): Promise<void> => {
     }))
 
   if (pulls.length === 0) {
-    info('🎉 No Pull Requests found. Nothing to merge.')
+    await exec('git fetch')
+    await exec(`git reset --hard origin/${base}`)
+    if (await hasDiff('HEAD', `origin/${branch}`)) {
+      await exec('git push -f')
+      info(`🎉 No Pull Requests found. Synced "dev" and "${branch}".`)
+    } else {
+      info('🎉 No Pull Requests found. Nothing to merge.')
+    }
     return
   }