Closed mikedep333 closed 3 months ago
❌ Failed to cleanly apply d83cdcc9473c0200754fdf5d76441b0e30baff4f on top of patchback/backports/3.21/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635
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-oci-images.git
$ git fetch upstream
$ git checkout -b patchback/backports/3.21/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635 upstream/3.21
$ git cherry-pick -x d83cdcc9473c0200754fdf5d76441b0e30baff4f
If it'll yell at you with something like fatal: Commit d83cdcc9473c0200754fdf5d76441b0e30baff4f is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x d83cdcc9473c0200754fdf5d76441b0e30baff4f
$ git push origin patchback/backports/3.21/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
✅ Backport PR branch: patchback/backports/3.22/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635
Backported as https://github.com/pulp/pulp-oci-images/pull/636
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
✅ Backport PR branch: patchback/backports/3.28/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635
Backported as https://github.com/pulp/pulp-oci-images/pull/637
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
Fixes: #634