Closed ansible-documentation-bot[bot] closed 3 weeks ago
❌ Failed to cleanly apply 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6 on top of patchback/backports/stable-2.14/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585
origin
remote.upstream
. If you don't
have it, here's how you can add it:
$ git remote add upstream https://github.com/ansible/ansible-documentation.git
$ git fetch upstream
$ git checkout -b patchback/backports/stable-2.14/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585 upstream/stable-2.14
$ git cherry-pick -x 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6
If it'll yell at you with something like fatal: Commit 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6
$ git push origin patchback/backports/stable-2.14/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6 on top of patchback/backports/stable-2.16/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585
origin
remote.upstream
. If you don't
have it, here's how you can add it:
$ git remote add upstream https://github.com/ansible/ansible-documentation.git
$ git fetch upstream
$ git checkout -b patchback/backports/stable-2.16/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585 upstream/stable-2.16
$ git cherry-pick -x 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6
If it'll yell at you with something like fatal: Commit 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6
$ git push origin patchback/backports/stable-2.16/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
✅ Backport PR branch: patchback/backports/stable-2.17/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585
Backported as https://github.com/ansible/ansible-documentation/pull/1601
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
Backport to stable-2.15: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6 on top of patchback/backports/stable-2.15/49762cb6ecd19e126ea343e2172e0ec7d73b0fd6/pr-1585
Backporting merged PR #1585 into devel
origin
remote.upstream
. If you don't have it, here's how you can add it:If it'll yell at you with something like
fatal: Commit 49762cb6ecd19e126ea343e2172e0ec7d73b0fd6 is a merge but no -m option was given.
, add-m 1
as follows instead:🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.