From e94055847bccaa677c0015c3c7f26ea7e53ade19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 24 Oct 2023 10:57:02 +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 00000000000..8b0e2336950 --- /dev/null +++ b/BACKPORT_TODO @@ -0,0 +1,11 @@ +Error on backporting to branch master, error on cherry picking eb28e9eab639217db9da9b5eed9f9c63467c088d: + + + +To continue do: +git fetch && git checkout backport/10778-to-master && git reset --hard HEAD^ +git cherry-pick eb28e9eab639217db9da9b5eed9f9c63467c088d +git cherry-pick 16d4379944acd061d21a8f18ae4a9dd1bfc929d5 +git cherry-pick ccbfd45729d436469c901ff999ab3a5ab899ec65 +git cherry-pick 51e982d747f5a9597da356b00ff7e9e38adc239d +git push origin backport/10778-to-master --force