From 129d8b2480207b449bf8c7a1d88842df6cb52e99 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 25 Jun 2026 15:04:52 +0000
Subject: [PATCH 1/3] Disable sync job in sync-upstream workflow

---
 .github/workflows/sync-upstream.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
index 7b2ddd7..12db615 100644
--- a/.github/workflows/sync-upstream.yml
+++ b/.github/workflows/sync-upstream.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   sync:
+    if: ${{ false }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

From 59f5c0fb720fc664ad04afd7353b2bd86e378b80 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 25 Jun 2026 15:05:54 +0000
Subject: [PATCH 2/3] Harden disabled sync workflow permissions

---
 .github/workflows/sync-upstream.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
index 12db615..e24c6b9 100644
--- a/.github/workflows/sync-upstream.yml
+++ b/.github/workflows/sync-upstream.yml
@@ -5,9 +5,13 @@ on:
     - cron: '0 0 * * *'  # Nightly at midnight UTC
   workflow_dispatch:  # Allow manual trigger
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   sync:
-    if: ${{ false }}
+    if: false
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

From 2342e6a126bcbbad68e28f41332c7225c2f15753 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 25 Jun 2026 15:06:38 +0000
Subject: [PATCH 3/3] Document why sync workflow job is disabled

---
 .github/workflows/sync-upstream.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
index e24c6b9..0c16387 100644
--- a/.github/workflows/sync-upstream.yml
+++ b/.github/workflows/sync-upstream.yml
@@ -11,6 +11,7 @@ permissions:
 
 jobs:
   sync:
+    # Disabled due to repeated merge-conflict failures in automation; run manually if needed.
     if: false
     runs-on: ubuntu-latest
     steps: