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