github/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-10-03 17:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suggest resolving conflicts by adding new commits vs amending the merge commit

Browse Source 
This gives us slightly messier git history, but more importantly makes
reviewing substantially easier.
This commit is contained in:
Henry Mercer
2022-04-25 16:37:32 +01:00
parent 5b5ed44ab7
commit 074853a9a2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/update-release-branch.py vendored
View File

@@ -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.')