From 688a190a8b44572483afb35dab94f926cf9421fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 27 Jun 2024 09:24:55 +0000 Subject: [PATCH] [skip ci] Add instructions to finish the backport --- BACKPORT_TODO | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 BACKPORT_TODO diff --git a/BACKPORT_TODO b/BACKPORT_TODO new file mode 100644 index 000000000000..034406e9105a --- /dev/null +++ b/BACKPORT_TODO @@ -0,0 +1,9 @@ +Error on backporting to branch 2.6, error on cherry picking 81e11ee1aea3c44623eaeb3d1cb6a57abb500bee: + + + +To continue do: +git fetch && git checkout backport/9379-to-2.6 && git reset --hard HEAD^ +git cherry-pick 81e11ee1aea3c44623eaeb3d1cb6a57abb500bee +git cherry-pick 8dd11e7026da390d1c0d9515374c179e9fb0c3a5 +git push origin backport/9379-to-2.6 --force