Skip to content

Conversation

@sethmlarson
Copy link
Contributor

Closes #1828

@sethmlarson sethmlarson force-pushed the reserved-keywords-in-kwargs branch from e049ebb to 4dce4bc Compare February 3, 2022 18:37
@sethmlarson sethmlarson merged commit 3dc2c27 into main Feb 3, 2022
@sethmlarson sethmlarson deleted the reserved-keywords-in-kwargs branch February 3, 2022 18:43
@github-actions
Copy link

github-actions bot commented Feb 3, 2022

The backport to 7.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.17 7.17
# Navigate to the new working tree
cd .worktrees/backport-7.17
# Create a new branch
git switch --create backport-1897-to-7.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 3dc2c27c395ab4e1ca6d8496791b3debee5ff211
# Push it to GitHub
git push --set-upstream origin backport-1897-to-7.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.17

Then, create a pull request where the base branch is 7.17 and the compare/head branch is backport-1897-to-7.17.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[7.16] Using reserved keywords within the scan helper results in errors

2 participants