conflit notifier made to check every 5 min

Author: JhaSourav07

.github/workflows/conflict-notifier.yml

@@ -2,7 +2,7 @@ name: Merge Conflict Notifier
 
 on:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '*/5 * * * *'
   workflow_dispatch:
 
 permissions:
@@ -76,20 +76,33 @@ jobs:
                   });
                 }
 
-                // Check if we've already posted a conflict comment to avoid spam
+                // Check existing comments to enforce a 2-hour notification gap
                 const { data: comments } = await github.rest.issues.listComments({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   issue_number: pr.number,
                   per_page: 100,
                 });
 
-                const alreadyCommented = comments.some(c =>
+                const conflictComments = comments.filter(c =>
                   c.user?.login === 'github-actions[bot]' &&
                   c.body?.includes('merge conflicts with the main branch')
                 );
 
-                if (!alreadyCommented) {
+                let shouldComment = false;
+                if (conflictComments.length === 0) {
+                  shouldComment = true;
+                } else {
+                  const lastComment = conflictComments[conflictComments.length - 1];
+                  const lastCommentTime = new Date(lastComment.created_at).getTime();
+                  const nowTime = new Date().getTime();
+                  const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
+                  if (nowTime - lastCommentTime >= TWO_HOURS_MS) {
+                    shouldComment = true;
+                  }
+                }
+
+                if (shouldComment) {
                   await github.rest.issues.createComment({
                     owner: context.repo.owner,
                     repo: context.repo.repo,