.github/template_patch: Warn about conflicts on multiple charts PRs

In the past, we added a comment to tell users that each patch release should be the subject of a dedicated PR in the Helm charts repo. However, opening these PRs in parallel means that there will be conflicts to address after one of them is merged. Let's warn release managers that they should as well wait for a PR to be merged before opening another (or expect a rebase to be necessary). Signed-off-by: Quentin Monnet <[email protected]>
cilium · Jun 26, 2023 · b95423a · b95423a
1 parent bb5454b
commit b95423a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release_template_patch.md b/.github/ISSUE_TEMPLATE/release_template_patch.md
@@ -80,9 +80,10 @@ assignees: ''
         and create a PR with these changes against the charts repository. Make
         sure the generated helm charts point to the commit that contains the
         image digests. Note: If you handle several patch releases at once,
-        create one PR per release, based one on top of the others to avoid
-        conflicts after one is merged. This is to make sure that the
-        corresponding workflow action run for each commit.
+        create one PR per release, to make sure that the corresponding workflow
+        action run for each commit. Wait for your PR to be merged before
+        creating the other ones for other patch releases, or they will
+        conflict.
   - [ ] Have a maintainer review and merge your PR.
   - [ ] Check the output of the [chart workflow] and see if the test was
         successful.