[skip ci] Add instructions to finish the backport

camptocamp · Jun 30, 2020 · 1417842 · 1417842
1 parent 0ce48ee
commit 1417842
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/BACKPORT_TODO b/BACKPORT_TODO
@@ -0,0 +1,14 @@
+Error on backporting to branch 2.4, error on cherry picking ['f06587e643bf3f755c23c676f6f1cab3b63078f1']:
+error: could not apply f06587e64... Localize query result in API
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+
+
+
+to continue do:
+git fetch
+git checkout backport/5974-to-2.4
+git reset --hard HEAD^
+git cherry-pick f06587e643bf3f755c23c676f6f1cab3b63078f1
+git push origin backport/5974-to-2.4 --force