From 074853a9a2289268af42d9c0d463185f015e03f0 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 25 Apr 2022 16:37:32 +0100 Subject: [PATCH] Suggest resolving conflicts by adding new commits vs amending the merge commit This gives us slightly messier git history, but more importantly makes reviewing substantially easier. --- .github/update-release-branch.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index f247695c4..106053dc3 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -85,9 +85,11 @@ def open_pr( body.append('') body.append('Please review the following:') if len(conflicted_files) > 0: - body.append(' - [ ] You have amended the merge commit appearing in this branch to resolve ' + - 'the merge conflicts in the following files:') + body.append(' - [ ] You have added commits to this branch that resolve the merge conflicts ' + + 'in the following files:') body.extend([f' - [ ] `{file}`' for file in conflicted_files]) + body.append(' - [ ] Another maintainer has reviewed the additional commits you added to this ' + + 'branch to resolve the merge conflicts.') body.append(' - [ ] The CHANGELOG displays the correct version and date.') body.append(' - [ ] The CHANGELOG includes all relevant, user-facing changes since the last release.') body.append(' - [ ] There are no unexpected commits being merged into the ' + target_branch + ' branch.')