There was an error while loading. Please reload this page.
1 parent 4822e9a commit 3f918d2Copy full SHA for 3f918d2
1 file changed
BACKPORT_TODO
@@ -0,0 +1,20 @@
1
+Backport of #12829 to master
2
+
3
+Error on cherry-picking: 277912d080492f03a7f4d58a5889f3043050edb4
4
5
+To continue do:
6
+```bash
7
+git fetch && \
8
+ git checkout ghci/backport/12829-to-master && \
9
+ git reset --hard HEAD^ && \
10
+ git cherry-pick 277912d080492f03a7f4d58a5889f3043050edb4
11
+```
12
+Resolve the conflict, then:
13
14
+git add <file> && \
15
+ git cherry-pick --continue
16
17
+When all the conflicts are resolved, push the branch:
18
19
+git push origin ghci/backport/12829-to-master --force
20
0 commit comments