From cff63196e7986178f0309540094827d5a93b2c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 21 Aug 2024 12:18:38 +0000 Subject: [PATCH] [skip ci] Add instructions to finish the backport --- BACKPORT_TODO | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 BACKPORT_TODO diff --git a/BACKPORT_TODO b/BACKPORT_TODO new file mode 100644 index 0000000000..116ff84b77 --- /dev/null +++ b/BACKPORT_TODO @@ -0,0 +1,11 @@ +Error on backporting to branch 3.27, error on cherry picking 82842e107f302e4de161b29eb1866a6d4fda48da: + + + +To continue do: +git fetch && git checkout backport/3374-to-3.27 && git reset --hard HEAD^ +git cherry-pick 82842e107f302e4de161b29eb1866a6d4fda48da +git cherry-pick 497cde1ba0fffab928fdc54fbedddc293575401b +git cherry-pick a3002bd898baac6e01c28699b21950eb5dc64e27 +git cherry-pick f0b2d9f666a632bd8819cc765e0d0c178d26a698 +git push origin backport/3374-to-3.27 --force