From 229ef5644f3b6e2d536a9d36059a09f5fd4d6bef Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2026 17:44:48 +0000
Subject: [PATCH] docs: add patch note for pr-sync-docs workflow fix

Creates a new patch note detailing the fix for the `pr-sync-docs` workflow. The CI pipeline will now skip branches with squash merge conflicts instead of failing the workflow.

Co-authored-by: NGGTLightKeeper <183194195+NGGTLightKeeper@users.noreply.github.com>
---
 .../PatchNotes/202606261740-pr-sync-docs.md    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Docs/ASLM/content/docs/PatchNotes/202606261740-pr-sync-docs.md

diff --git a/Docs/ASLM/content/docs/PatchNotes/202606261740-pr-sync-docs.md b/Docs/ASLM/content/docs/PatchNotes/202606261740-pr-sync-docs.md
new file mode 100644
index 0000000..506e3ca
--- /dev/null
+++ b/Docs/ASLM/content/docs/PatchNotes/202606261740-pr-sync-docs.md
@@ -0,0 +1,18 @@
+---
+title: "Fix PR Sync Docs Merge Handling"
+date: 2026-06-26T17:40:50Z
+draft: false
+description: "Updated pr-sync-docs workflow to skip branches with squash merge conflicts instead of failing the workflow."
+---
+
+## New Features
+- None
+
+## Bug Fixes
+- **pr-sync-docs workflow:** Improved merge conflict handling. The workflow will now drop the branch and continue processing other branches when a squash merge conflict occurs, rather than failing the entire workflow.
+
+## API Changes
+- None
+
+## Known Issues
+- None