From 1c9c568b895b2c13e217a3b8b9d047f82746ed62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 13 Nov 2020 11:14:38 +0000 Subject: [PATCH] [skip ci] Add instructions to finish the backport --- BACKPORT_TODO | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 BACKPORT_TODO diff --git a/BACKPORT_TODO b/BACKPORT_TODO new file mode 100644 index 0000000000..d356d133aa --- /dev/null +++ b/BACKPORT_TODO @@ -0,0 +1,12 @@ +Error on backporting to branch master, error on cherry picking ['32ca3d3e3270eaff09a2d387ab5e84750ef6a80d']: + + + +to continue do: +git fetch && git checkout backport/754-to-master && git reset --mixed HEAD^ +rm BACKPORT_TODO +git apply --3way --index 32ca3d3e3270eaff09a2d387ab5e84750ef6a80d.patch +rm 32ca3d3e3270eaff09a2d387ab5e84750ef6a80d.patch +git commit --message="Add Clean Docker hub tags workflow +" +git push origin backport/754-to-master --force