Closed mdellweg closed 11 months ago
❌ Failed to cleanly apply 76be83777a964e9e92adbddfe90ef74b6fce079b on top of patchback/backports/1.6/76be83777a964e9e92adbddfe90ef74b6fce079b/pr-305
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-certguard.git
$ git fetch upstream
$ git checkout -b patchback/backports/1.6/76be83777a964e9e92adbddfe90ef74b6fce079b/pr-305 upstream/1.6
$ git cherry-pick -x 76be83777a964e9e92adbddfe90ef74b6fce079b
If it'll yell at you with something like fatal: Commit 76be83777a964e9e92adbddfe90ef74b6fce079b is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 76be83777a964e9e92adbddfe90ef74b6fce079b
$ git push origin patchback/backports/1.6/76be83777a964e9e92adbddfe90ef74b6fce079b/pr-305
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
This is intentionally not bumping to 3.54 right now, so we have the chance to merge the codebase of this plugin with pulpcore in 3.45.
[noissue]