Closed dependabot[bot] closed 1 month ago
β Failed to cleanly apply fbc79e263fe2c1aef4b99e4ab04d851444306c85 on top of patchback/backports/0.29/fbc79e263fe2c1aef4b99e4ab04d851444306c85/pr-1099
origin
remote.upstream
. If you don't
have it, here's how you can add it:
$ git remote add upstream https://github.com/pulp/pulp-cli.git
$ git fetch upstream
$ git checkout -b patchback/backports/0.29/fbc79e263fe2c1aef4b99e4ab04d851444306c85/pr-1099 upstream/0.29
$ git cherry-pick -x fbc79e263fe2c1aef4b99e4ab04d851444306c85
If it'll yell at you with something like fatal: Commit fbc79e263fe2c1aef4b99e4ab04d851444306c85 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x fbc79e263fe2c1aef4b99e4ab04d851444306c85
$ git push origin patchback/backports/0.29/fbc79e263fe2c1aef4b99e4ab04d851444306c85/pr-1099
π€ @patchback I'm built with octomachinery and my source is open β https://github.com/sanitizers/patchback-github-app.
Updates the requirements on tomli-w to permit the latest version.
Changelog
Sourced from tomli-w's changelog.
... (truncated)
Commits
1791056
Bump version: 1.0.0 β 1.1.0fc17bb4
Add v1.1.0 changelog293e0a1
Raise ValueError when indent is negative. Update README54268af
Use py3.8 positional-only parameter syntaxbd014da
[pre-commit.ci] pre-commit autoupdate (#47)af607ff
Addindent
control knob (#49)36354bd
Fix GitHub Actions badge8ef725e
Drop support for EOL Python 3.7 and 3.8 (#51)deec36a
Accept generic mapping types (#46)9d939b5
[pre-commit.ci] pre-commit autoupdateDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show