Closed ansible-documentation-bot[bot] closed 1 day ago
❌ Failed to cleanly apply 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.14/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
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/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657 upstream/stable-2.14
$ git cherry-pick -x 6844870ed800f5696c776180b7470eaa0ae2dd42
If it'll yell at you with something like fatal: Commit 6844870ed800f5696c776180b7470eaa0ae2dd42 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 6844870ed800f5696c776180b7470eaa0ae2dd42
$ git push origin patchback/backports/stable-2.14/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.16/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
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/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657 upstream/stable-2.16
$ git cherry-pick -x 6844870ed800f5696c776180b7470eaa0ae2dd42
If it'll yell at you with something like fatal: Commit 6844870ed800f5696c776180b7470eaa0ae2dd42 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 6844870ed800f5696c776180b7470eaa0ae2dd42
$ git push origin patchback/backports/stable-2.16/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.17/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
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.17/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657 upstream/stable-2.17
$ git cherry-pick -x 6844870ed800f5696c776180b7470eaa0ae2dd42
If it'll yell at you with something like fatal: Commit 6844870ed800f5696c776180b7470eaa0ae2dd42 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 6844870ed800f5696c776180b7470eaa0ae2dd42
$ git push origin patchback/backports/stable-2.17/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
🤖 @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 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.15/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
Backporting merged PR #1657 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 6844870ed800f5696c776180b7470eaa0ae2dd42 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.