Repo File Sync: Sync to Mu DevOps Release Branch Backport Workflow (#…

…1205) synced local file(s) with [microsoft/mu_devops](https://github.com/microsoft/mu_devops). 🤖: View the [Repo File Sync Configuration File](https://github.com/microsoft/mu_devops/blob/main/.sync/Files.yml) to see how files are synced. --- This PR was created automatically by the [repo-file-sync-action](https://github.com/BetaHuhn/repo-file-sync-action) workflow run [#11631955745](https://github.com/microsoft/mu_devops/actions/runs/11631955745) Signed-off-by: Project Mu UEFI Bot <[email protected]>
microsoft · Nov 1, 2024 · e84cb51 · e84cb51
1 parent e4e6b78
commit e84cb51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,12 +4,12 @@
 
 For details on how to complete these options and their meaning refer to [CONTRIBUTING.md](https://github.com/microsoft/mu/blob/HEAD/CONTRIBUTING.md).
 
-- [ ] Backport to release branch?
 - [ ] Impacts functionality?
 - [ ] Impacts security?
 - [ ] Breaking change?
 - [ ] Includes tests?
 - [ ] Includes documentation?
+- [ ] Backport to release branch?
 
 ## How This Was Tested
 

diff --git a/.github/workflows/backport-to-release-branch.yml b/.github/workflows/backport-to-release-branch.yml
@@ -1,16 +1,20 @@
 # This workflow moves marked commits from a development branch to a release branch.
 #
 # Each commit in the development branch is cherry-picked to the release branch if the commit originates from a merged
-# PR that is marked for backport. If a merge conflict occurs, the commit is committed to a new branch with merge
-# markers and then a PR is created into the target branch with those markers. The PR is labeled with
-# "type:release-merge-conflict" to indicate that it needs manual resolution.
+# PR that is marked for backport.
+#
+# Merge conflicts should be rare. Should one occur, the changes are committed to a new branch with merge markers and
+# then a PR is created into the target branch with those markers. The PR is labeled with "type:release-merge-conflict"
+# to indicate that it needs manual resolution.
 #
 # The PR is expected to fail compilation and status checks (of course) due to the merge conflict markers. A human
 # should then checkout the PR branch, resolve the conflicts, and push the changes back to the PR branch.
 #
-# This workflow is currently being tested in the Mu Basecore repository. Once it performs well over a reasonable
-# period of time, it will be moved to the Mu DevOps repository for general use and synced to other relevant
-# repositories using a more generalized template to fill in some of the details.
+# NOTE: This file is automatically synchronized from Mu DevOps. Update the original file there
+#       instead of the file in this repo.
+#
+# - Mu DevOps Repo: https://github.com/microsoft/mu_devops
+# - File Sync Settings: https://github.com/microsoft/mu_devops/blob/main/.sync/Files.yml
 #
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -226,3 +230,4 @@ jobs:
         -d "{\"title\":\"$PR_TITLE\",\"body\":\"$PR_BODY\",\"head\":\"$PR_BRANCH\",\"base\":\"$BASE_BRANCH\",\"labels\":[\"type:release-merge-conflict\"]}"
       env:
         CHERRY_PICK_TOKEN: ${{ secrets.CHERRY_PICK_TOKEN }}
+