From 3bb6c41212bf21b7908928b87d869cc36307d630 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 11 May 2022 10:50:13 +0100 Subject: [PATCH] Remove an extraneous commit during the release process We only need to run `git commit` after the `git merge` call if there were conflicts. --- .github/update-release-branch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index 70cc318726..c5f5c1dbbb 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -292,7 +292,7 @@ def main(): conflicted_files = run_git('diff', '--name-only', '--diff-filter', 'U').splitlines() if len(conflicted_files) > 0: run_git('add', '.') - run_git('commit', '--no-edit') + run_git('commit', '--no-edit') # Migrate the package version number from a v2 version number to a v1 version number print(f'Setting version number to {version}')