From 7b17bc5442132e98f7aec646a3c677be4c02e7a9 Mon Sep 17 00:00:00 2001
From: Nick Frichette <nick@frichetten.com>
Date: Sun, 25 Jan 2026 14:36:54 -0600
Subject: [PATCH 1/3] Added GitHub actions merge scheduler

---
 .github/scripts/parse_schedule.py     |  88 ++++++++
 .github/workflows/scheduled_merge.yml | 287 ++++++++++++++++++++++++++
 CONTRIBUTING.md                       |  20 ++
 3 files changed, 395 insertions(+)
 create mode 100644 .github/scripts/parse_schedule.py
 create mode 100644 .github/workflows/scheduled_merge.yml

diff --git a/.github/scripts/parse_schedule.py b/.github/scripts/parse_schedule.py
new file mode 100644
index 000000000..0ec4380a7
--- /dev/null
+++ b/.github/scripts/parse_schedule.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+import os
+import re
+from datetime import datetime, timezone
+from zoneinfo import ZoneInfo
+
+
+def write_output(key: str, value: str) -> None:
+    path = os.environ.get("GITHUB_OUTPUT")
+    if not path:
+        return
+    with open(path, "a", encoding="utf-8") as handle:
+        handle.write(f"{key}={value}\n")
+
+
+def fail(message: str) -> None:
+    write_output("valid", "false")
+    write_output("error", message)
+
+
+raw = os.environ.get("RAW", "").strip()
+if not raw:
+    fail("Missing schedule time.")
+    raise SystemExit(0)
+
+normalized = re.sub(r"\s+", " ", raw).strip()
+match = re.match(
+    r"^(?P<date>\d{4}-\d{2}-\d{2})\s+(?P<time>\d{1,2}(:\d{2})?\s*(am|pm)?)\s*(?P<tz>ct|cst|cdt)?$",
+    normalized,
+    re.IGNORECASE,
+)
+
+if not match:
+    fail(
+        "Invalid time format. Use `/schedule-merge YYYY-MM-DD HH:MM CT` or `/schedule-merge YYYY-MM-DD 9am CT`."
+    )
+    raise SystemExit(0)
+
+date_part = match.group("date")
+time_part = match.group("time").strip().lower()
+
+hour = None
+minute = 0
+
+ampm_match = re.match(r"^(?P<h>\d{1,2})(:(?P<m>\d{2}))?(?P<ampm>am|pm)$", time_part.replace(" ", ""))
+if ampm_match:
+    hour = int(ampm_match.group("h"))
+    minute = int(ampm_match.group("m") or 0)
+    ampm = ampm_match.group("ampm")
+    if hour < 1 or hour > 12 or minute > 59:
+        fail("Invalid time value.")
+        raise SystemExit(0)
+    if ampm == "pm" and hour != 12:
+        hour += 12
+    if ampm == "am" and hour == 12:
+        hour = 0
+else:
+    hm_match = re.match(r"^(?P<h>\d{1,2})(:(?P<m>\d{2}))?$", time_part)
+    if not hm_match:
+        fail("Invalid time value.")
+        raise SystemExit(0)
+    hour = int(hm_match.group("h"))
+    minute = int(hm_match.group("m") or 0)
+    if hour > 23 or minute > 59:
+        fail("Invalid time value.")
+        raise SystemExit(0)
+
+year, month, day = [int(part) for part in date_part.split("-")]
+local_tz = ZoneInfo("America/Chicago")
+try:
+    local_dt = datetime(year, month, day, hour, minute, tzinfo=local_tz)
+except ValueError:
+    fail("Invalid calendar date.")
+    raise SystemExit(0)
+utc_dt = local_dt.astimezone(timezone.utc)
+
+now_utc = datetime.now(timezone.utc)
+if utc_dt <= now_utc:
+    fail("Scheduled time must be in the future.")
+    raise SystemExit(0)
+
+utc_iso = utc_dt.replace(microsecond=0).isoformat().replace("+00:00", "Z")
+local_iso = local_dt.replace(microsecond=0).isoformat()
+
+write_output("valid", "true")
+write_output("utc", utc_iso)
+write_output("local", local_iso)
+write_output("display", local_dt.strftime("%Y-%m-%d %I:%M %p CT"))
diff --git a/.github/workflows/scheduled_merge.yml b/.github/workflows/scheduled_merge.yml
new file mode 100644
index 000000000..58e58c52a
--- /dev/null
+++ b/.github/workflows/scheduled_merge.yml
@@ -0,0 +1,287 @@
+name: scheduled merge
+
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    - cron: "*/5 * * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+jobs:
+  schedule:
+    if: github.event_name == 'issue_comment'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Extract schedule command
+        id: command
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const body = context.payload.comment?.body || '';
+            const match = body.match(/^\s*\/schedule-merge\s+([^\n\r]+)\s*$/im);
+            if (!match || !context.payload.issue?.pull_request) {
+              core.setOutput('found', 'false');
+              return;
+            }
+            core.setOutput('found', 'true');
+            core.setOutput('raw', match[1].trim());
+            core.setOutput('pr', String(context.payload.issue.number));
+            core.setOutput('commenter', context.payload.comment.user.login);
+      - name: Check commenter permissions
+        id: perms
+        if: steps.command.outputs.found == 'true'
+        uses: actions/github-script@v7
+        env:
+          USERNAME: ${{ steps.command.outputs.commenter }}
+        with:
+          script: |
+            const username = process.env.USERNAME;
+            let permission = 'none';
+            try {
+              const response = await github.rest.repos.getCollaboratorPermissionLevel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                username,
+              });
+              permission = response.data.permission || 'none';
+            } catch (error) {
+              permission = 'none';
+            }
+            const allowed = ['admin', 'maintain', 'write'].includes(permission);
+            core.setOutput('allowed', allowed ? 'true' : 'false');
+            core.setOutput('permission', permission);
+      - name: Parse schedule time
+        id: parse
+        if: steps.command.outputs.found == 'true'
+        run: python .github/scripts/parse_schedule.py
+        env:
+          RAW: ${{ steps.command.outputs.raw }}
+      - name: Reject unauthorized scheduling
+        if: steps.command.outputs.found == 'true' && steps.perms.outputs.allowed != 'true'
+        uses: actions/github-script@v7
+        env:
+          PR_NUMBER: ${{ steps.command.outputs.pr }}
+          PERMISSION: ${{ steps.perms.outputs.permission }}
+        with:
+          script: |
+            const prNumber = Number(process.env.PR_NUMBER);
+            const permission = process.env.PERMISSION || 'none';
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: `Scheduling is limited to maintainers (write/maintain/admin). Current permission: ${permission}.`,
+            });
+      - name: Report invalid schedule time
+        if: steps.command.outputs.found == 'true' && steps.perms.outputs.allowed == 'true' && steps.parse.outputs.valid != 'true'
+        uses: actions/github-script@v7
+        env:
+          PR_NUMBER: ${{ steps.command.outputs.pr }}
+          ERROR: ${{ steps.parse.outputs.error }}
+        with:
+          script: |
+            const prNumber = Number(process.env.PR_NUMBER);
+            const error = process.env.ERROR || 'Invalid schedule time.';
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: `${error}\n\nUsage: \`/schedule-merge YYYY-MM-DD HH:MM CT\` (example: \`/schedule-merge 2026-01-28 09:00 CT\`).`,
+            });
+      - name: Record schedule
+        if: steps.command.outputs.found == 'true' && steps.perms.outputs.allowed == 'true' && steps.parse.outputs.valid == 'true'
+        uses: actions/github-script@v7
+        env:
+          PR_NUMBER: ${{ steps.command.outputs.pr }}
+          UTC_TIME: ${{ steps.parse.outputs.utc }}
+          DISPLAY_TIME: ${{ steps.parse.outputs.display }}
+        with:
+          script: |
+            const prNumber = Number(process.env.PR_NUMBER);
+            const utcTime = process.env.UTC_TIME;
+            const displayTime = process.env.DISPLAY_TIME;
+            const label = 'scheduled-merge';
+            try {
+              await github.rest.issues.getLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: label,
+              });
+            } catch (error) {
+              if (error.status === 404) {
+                await github.rest.issues.createLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  name: label,
+                  color: '0e8a16',
+                  description: 'PRs scheduled for automatic merge',
+                });
+              } else {
+                throw error;
+              }
+            }
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              labels: [label],
+            });
+            const marker = `<!-- scheduled-merge: ${utcTime} -->`;
+            const body = `${marker}\nScheduled merge for ${displayTime} (UTC ${utcTime}).\n\nTo reschedule, comment again with a new time.`;
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body,
+            });
+
+  merge:
+    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge scheduled pull requests
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const now = new Date();
+            const issues = await github.paginate(github.rest.issues.listForRepo, {
+              owner,
+              repo,
+              state: 'open',
+              labels: 'scheduled-merge',
+              per_page: 100,
+            });
+
+            for (const issue of issues) {
+              if (!issue.pull_request) {
+                continue;
+              }
+
+              const comments = await github.paginate(github.rest.issues.listComments, {
+                owner,
+                repo,
+                issue_number: issue.number,
+                per_page: 100,
+              });
+
+              const isWorkflowComment = (comment) => {
+                if (comment.user?.login === 'github-actions[bot]') {
+                  return true;
+                }
+                const app = comment.performed_via_github_app;
+                if (app && app.slug === 'github-actions') {
+                  return true;
+                }
+                return false;
+              };
+
+              const scheduledComments = comments
+                .map((comment) => {
+                  if (!isWorkflowComment(comment)) {
+                    return null;
+                  }
+                  const match = comment.body?.match(/<!-- scheduled-merge: ([^\\s]+) -->/);
+                  if (!match) {
+                    return null;
+                  }
+                  return {
+                    utc: match[1],
+                    created_at: comment.created_at,
+                  };
+                })
+                .filter(Boolean)
+                .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+
+              if (scheduledComments.length === 0) {
+                await github.rest.issues.removeLabel({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  name: 'scheduled-merge',
+                });
+                await github.rest.issues.createComment({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  body: 'Scheduled merge label removed because no schedule marker was found. Comment again to reschedule.',
+                });
+                continue;
+              }
+
+              const scheduled = scheduledComments[0];
+              const scheduledAt = new Date(scheduled.utc);
+              if (Number.isNaN(scheduledAt.getTime())) {
+                await github.rest.issues.removeLabel({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  name: 'scheduled-merge',
+                });
+                await github.rest.issues.createComment({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  body: `Scheduled merge cleared because the stored time was invalid (${scheduled.utc}). Comment again to reschedule.`,
+                });
+                continue;
+              }
+
+              if (now < scheduledAt) {
+                continue;
+              }
+
+              const pr = await github.rest.pulls.get({
+                owner,
+                repo,
+                pull_number: issue.number,
+              });
+
+              if (pr.data.draft) {
+                continue;
+              }
+
+              try {
+                await github.rest.pulls.merge({
+                  owner,
+                  repo,
+                  pull_number: issue.number,
+                  merge_method: 'merge',
+                  sha: pr.data.head.sha,
+                });
+                await github.rest.issues.removeLabel({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  name: 'scheduled-merge',
+                });
+                await github.rest.issues.createComment({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  body: `Merged automatically at ${now.toISOString()}.`,
+                });
+              } catch (error) {
+                await github.rest.issues.removeLabel({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  name: 'scheduled-merge',
+                });
+                await github.rest.issues.createComment({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  body: `Scheduled merge failed and was cleared. ${error.message || error}`,
+                });
+              }
+            }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 325a5bbe2..42f9a6f14 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,26 @@ docker run --rm -it -p 8000:8000 -v ${PWD}:/docs mkdocs-material
 
 __NOTE__: You do not have to run the Docker container to contribute. You can make edits or even create new pages directly from GitHub. Go to the file you'd like to edit, or the directory you'd like to add to and click "Add File" in the mid-top right. Use the Markdown editor built into GitHub and submit your Pull Request.
 
+## Scheduled Merges (Publishing at a Specific Time)
+
+If you want your PR to merge at a specific time (so it deploys on schedule), leave a PR comment with:
+
+```
+/schedule-merge YYYY-MM-DD HH:MM CT
+```
+
+Example:
+
+```
+/schedule-merge 2026-01-28 09:00 CT
+```
+
+Notes:
+- Times are interpreted as Central Time (America/Chicago, including daylight saving time).
+- Only maintainers with write/maintain/admin permissions can schedule a merge.
+- To reschedule, comment again with a new time; the latest schedule wins.
+- If the merge fails (checks/merge conflicts), the schedule is cleared and you can fix the PR and reschedule.
+
 ## Using Cards
 
 If you'd like to use a card, for [example](https://hackingthe.cloud/aws/post_exploitation/create_a_console_session_from_iam_credentials/) `Technique seen in the wild`, `Tools mentioned in this article`, etc, __please be aware that you would need a subscription for [Material for MKDocs](https://squidfunk.github.io/mkdocs-material/reference/grids/#using-card-grids) for the cards to be properly displayed on your local machine__. Simply copy and paste the template from the options below and it will be properly rendered on the site (we have a subscription to Material for MKDocs).

From 232781c4a05ba25553636b3800fde8b1300c9fa8 Mon Sep 17 00:00:00 2001
From: Nick Frichette <nick@frichetten.com>
Date: Sun, 25 Jan 2026 15:06:01 -0600
Subject: [PATCH 2/3] More updates to the scheduler

---
 .github/scripts/parse_schedule.py     | 12 ++++-
 .github/workflows/scheduled_merge.yml | 77 +++++++++++++++++++++++----
 CONTRIBUTING.md                       | 10 +++-
 3 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/parse_schedule.py b/.github/scripts/parse_schedule.py
index 0ec4380a7..6cf183848 100644
--- a/.github/scripts/parse_schedule.py
+++ b/.github/scripts/parse_schedule.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 import os
 import re
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from zoneinfo import ZoneInfo
 
+SCHEDULE_TIMEZONE = "America/Chicago"
+MAX_SCHEDULE_DAYS = 30
+
 
 def write_output(key: str, value: str) -> None:
     path = os.environ.get("GITHUB_OUTPUT")
@@ -66,7 +69,7 @@ def fail(message: str) -> None:
         raise SystemExit(0)
 
 year, month, day = [int(part) for part in date_part.split("-")]
-local_tz = ZoneInfo("America/Chicago")
+local_tz = ZoneInfo(SCHEDULE_TIMEZONE)
 try:
     local_dt = datetime(year, month, day, hour, minute, tzinfo=local_tz)
 except ValueError:
@@ -79,6 +82,11 @@ def fail(message: str) -> None:
     fail("Scheduled time must be in the future.")
     raise SystemExit(0)
 
+max_future = now_utc + timedelta(days=MAX_SCHEDULE_DAYS)
+if utc_dt > max_future:
+    fail(f"Scheduled time must be within {MAX_SCHEDULE_DAYS} days from now.")
+    raise SystemExit(0)
+
 utc_iso = utc_dt.replace(microsecond=0).isoformat().replace("+00:00", "Z")
 local_iso = local_dt.replace(microsecond=0).isoformat()
 
diff --git a/.github/workflows/scheduled_merge.yml b/.github/workflows/scheduled_merge.yml
index 58e58c52a..7e5881424 100644
--- a/.github/workflows/scheduled_merge.yml
+++ b/.github/workflows/scheduled_merge.yml
@@ -16,6 +16,9 @@ jobs:
   schedule:
     if: github.event_name == 'issue_comment'
     runs-on: ubuntu-latest
+    concurrency:
+      group: schedule-${{ github.event.issue.number }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -27,13 +30,26 @@ jobs:
         with:
           script: |
             const body = context.payload.comment?.body || '';
-            const match = body.match(/^\s*\/schedule-merge\s+([^\n\r]+)\s*$/im);
-            if (!match || !context.payload.issue?.pull_request) {
+            if (!context.payload.issue?.pull_request) {
+              core.setOutput('found', 'false');
+              return;
+            }
+            const cancelMatch = body.match(/^\s*\/unschedule-merge\s*$/im);
+            if (cancelMatch) {
+              core.setOutput('found', 'true');
+              core.setOutput('action', 'cancel');
+              core.setOutput('pr', String(context.payload.issue.number));
+              core.setOutput('commenter', context.payload.comment.user.login);
+              return;
+            }
+            const scheduleMatch = body.match(/^\s*\/schedule-merge\s+([^\n\r]+)\s*$/im);
+            if (!scheduleMatch) {
               core.setOutput('found', 'false');
               return;
             }
             core.setOutput('found', 'true');
-            core.setOutput('raw', match[1].trim());
+            core.setOutput('action', 'schedule');
+            core.setOutput('raw', scheduleMatch[1].trim());
             core.setOutput('pr', String(context.payload.issue.number));
             core.setOutput('commenter', context.payload.comment.user.login);
       - name: Check commenter permissions
@@ -61,11 +77,11 @@ jobs:
             core.setOutput('permission', permission);
       - name: Parse schedule time
         id: parse
-        if: steps.command.outputs.found == 'true'
+        if: steps.command.outputs.found == 'true' && steps.command.outputs.action == 'schedule'
         run: python .github/scripts/parse_schedule.py
         env:
           RAW: ${{ steps.command.outputs.raw }}
-      - name: Reject unauthorized scheduling
+      - name: Reject unauthorized user
         if: steps.command.outputs.found == 'true' && steps.perms.outputs.allowed != 'true'
         uses: actions/github-script@v7
         env:
@@ -82,7 +98,7 @@ jobs:
               body: `Scheduling is limited to maintainers (write/maintain/admin). Current permission: ${permission}.`,
             });
       - name: Report invalid schedule time
-        if: steps.command.outputs.found == 'true' && steps.perms.outputs.allowed == 'true' && steps.parse.outputs.valid != 'true'
+        if: steps.command.outputs.found == 'true' && steps.command.outputs.action == 'schedule' && steps.perms.outputs.allowed == 'true' && steps.parse.outputs.valid != 'true'
         uses: actions/github-script@v7
         env:
           PR_NUMBER: ${{ steps.command.outputs.pr }}
@@ -98,7 +114,7 @@ jobs:
               body: `${error}\n\nUsage: \`/schedule-merge YYYY-MM-DD HH:MM CT\` (example: \`/schedule-merge 2026-01-28 09:00 CT\`).`,
             });
       - name: Record schedule
-        if: steps.command.outputs.found == 'true' && steps.perms.outputs.allowed == 'true' && steps.parse.outputs.valid == 'true'
+        if: steps.command.outputs.found == 'true' && steps.command.outputs.action == 'schedule' && steps.perms.outputs.allowed == 'true' && steps.parse.outputs.valid == 'true'
         uses: actions/github-script@v7
         env:
           PR_NUMBER: ${{ steps.command.outputs.pr }}
@@ -136,13 +152,40 @@ jobs:
               labels: [label],
             });
             const marker = `<!-- scheduled-merge: ${utcTime} -->`;
-            const body = `${marker}\nScheduled merge for ${displayTime} (UTC ${utcTime}).\n\nTo reschedule, comment again with a new time.`;
+            const body = `${marker}\nScheduled merge for ${displayTime} (UTC ${utcTime}).\n\nTo reschedule, comment again with a new time. To cancel, comment \`/unschedule-merge\`.`;
             await github.rest.issues.createComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: prNumber,
               body,
             });
+      - name: Cancel scheduled merge
+        if: steps.command.outputs.found == 'true' && steps.command.outputs.action == 'cancel' && steps.perms.outputs.allowed == 'true'
+        uses: actions/github-script@v7
+        env:
+          PR_NUMBER: ${{ steps.command.outputs.pr }}
+        with:
+          script: |
+            const prNumber = Number(process.env.PR_NUMBER);
+            const label = 'scheduled-merge';
+            try {
+              await github.rest.issues.removeLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                name: label,
+              });
+            } catch (error) {
+              if (error.status !== 404) {
+                throw error;
+              }
+            }
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: 'Scheduled merge has been cancelled.',
+            });
 
   merge:
     if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
@@ -190,7 +233,7 @@ jobs:
                   if (!isWorkflowComment(comment)) {
                     return null;
                   }
-                  const match = comment.body?.match(/<!-- scheduled-merge: ([^\\s]+) -->/);
+                  const match = comment.body?.match(/<!-- scheduled-merge: (\S+) -->/);
                   if (!match) {
                     return null;
                   }
@@ -250,6 +293,22 @@ jobs:
                 continue;
               }
 
+              if (pr.data.mergeable === false) {
+                await github.rest.issues.removeLabel({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  name: 'scheduled-merge',
+                });
+                await github.rest.issues.createComment({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  body: 'Scheduled merge failed: PR has merge conflicts or is not mergeable. Please resolve and reschedule.',
+                });
+                continue;
+              }
+
               try {
                 await github.rest.pulls.merge({
                   owner,
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 42f9a6f14..009a9fe95 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,9 +44,17 @@ Example:
 /schedule-merge 2026-01-28 09:00 CT
 ```
 
+To cancel a scheduled merge, comment:
+
+```
+/unschedule-merge
+```
+
 Notes:
 - Times are interpreted as Central Time (America/Chicago, including daylight saving time).
-- Only maintainers with write/maintain/admin permissions can schedule a merge.
+- Merges are processed every 5 minutes, so the actual merge may occur up to 5 minutes after the scheduled time.
+- Only maintainers with write/maintain/admin permissions can schedule or cancel a merge.
+- Schedules must be within 30 days from the current date.
 - To reschedule, comment again with a new time; the latest schedule wins.
 - If the merge fails (checks/merge conflicts), the schedule is cleared and you can fix the PR and reschedule.
 

From f69280c9a11fe68096b9ea1d8e725cfb5387421c Mon Sep 17 00:00:00 2001
From: Nick Frichette <nick@frichetten.com>
Date: Sun, 25 Jan 2026 15:16:02 -0600
Subject: [PATCH 3/3] Worked on scheduler

---
 .github/workflows/scheduled_merge.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/scheduled_merge.yml b/.github/workflows/scheduled_merge.yml
index 7e5881424..786bcd85f 100644
--- a/.github/workflows/scheduled_merge.yml
+++ b/.github/workflows/scheduled_merge.yml
@@ -14,11 +14,10 @@ permissions:
 
 jobs:
   schedule:
-    if: github.event_name == 'issue_comment'
+    if: github.event_name == 'issue_comment' && (contains(github.event.comment.body, '/schedule-merge') || contains(github.event.comment.body, '/unschedule-merge'))
     runs-on: ubuntu-latest
     concurrency:
       group: schedule-${{ github.event.issue.number }}
-      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5