Skip to content

Commit

Permalink
Merge pull request #1065 from github/henrymercer/remove-extraneous-co…
Browse files Browse the repository at this point in the history
…mmit

Remove an extraneous commit during the release process
  • Loading branch information
henrymercer authored May 11, 2022
2 parents 75b4f1c + 3bb6c41 commit 03e2e3c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/update-release-branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}')
Expand Down

0 comments on commit 03e2e3c

Please sign in to comment.