Skip to content

Mergeback v2.1.10 refs/heads/releases/v2 into main #1067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrymercer merged 4 commits into from
May 11, 2022
Merged

Mergeback v2.1.10 refs/heads/releases/v2 into main #1067

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bb6c41
Remove an extraneous commit during the release process
henrymercer May 11, 2022
03e2e3c
Merge pull request #1065 from github/henrymercer/remove-extraneous-co…
henrymercer May 11, 2022
daf6560
Update changelog and version after v2.1.10
invalid-email-address May 11, 2022
4f87830
Merge branch 'main' into mergeback/v2.1.10-to-main-03e2e3c4
henrymercer May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/update-release-branch.py
View file
Open in desktop
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