From 5549284a7f6e24e883bf7f3a90e14feddae68e8c Mon Sep 17 00:00:00 2001 From: Lutz Date: Mon, 23 Mar 2026 15:58:04 +0100 Subject: [PATCH] Adjusted the merge guidance to align with Chrome --- src/docs/merge-patch.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/docs/merge-patch.md b/src/docs/merge-patch.md index 5bb959c1..4dcd956b 100644 --- a/src/docs/merge-patch.md +++ b/src/docs/merge-patch.md @@ -58,9 +58,7 @@ On top the **Releases** section should show a Canary. 1. Open the CL you want to back-merge. 1. Select "Cherry pick" from the extended menu (three vertical dots in the upper right corner). 1. Enter "refs/branch-heads/*XX.X*" as destination branch (replace *XX.X* by the proper branch). -1. Modify the commit message: - 1. Prefix the title with "Merged: ". - 1. Remove lines from the footer that correspond to the original CL ("Change-Id", "Reviewed-on", "Reviewed-by", "Commit-Queue", "Cr-Commit-Position"). Definitely keep the "(cherry picked from commit XXX)" line, as this is needed by some tools to relate merges to original CLs. +1. Modify the commit message and prefix the title with "Merged: ". 1. In case of merge conflict, please also go ahead and create the CL. To resolve conflicts (if any) - either using the gerrit UI or you can easily pull the patch locally by using the "download patch" command from the menu (three vertical dots in the upper right corner). 1. Send out for review.