Closed martinRenou closed 7 months ago
meeseeksdev backport to 0.x
Owee, I'm MrMeeseeks, Look at me.
There seem to be a conflict, please backport manually. Here are approximate instructions:
git checkout 0.x
git pull
Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 7b4b935d1018b1f3cf015b6554c04c90eb9cb95a
You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #194: Pin xeus-lite'
git push YOURFORK 0.x:auto-backport-of-pr-194-on-0.x
"Backport PR #194 on branch 0.x (Pin xeus-lite)"
And apply the correct labels and milestones.
Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!
Remember to remove the Still Needs Manual Backport
label once the PR gets merged.
If these instructions are inaccurate, feel free to suggest an improvement.
:point_left: Try it on ReadTheDocs