Closed martinkim0 closed 3 months ago
Owee, I'm MrMeeseeks, Look at me.
There seem to be a conflict, please backport manually. Here are approximate instructions:
git checkout 1.1.x git pull
Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 c9b1073e7032362f9118c6d14b3553046658ce89
You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2852: release: update tutorials and 1.1.3 release date'
git push YOURFORK 1.1.x:auto-backport-of-pr-2852-on-1.1.x
"Backport PR #2852 on branch 1.1.x (release: update tutorials and 1.1.3 release date)"
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.
Still Needs Manual Backport
If these instructions are inaccurate, feel free to suggest an improvement.
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 85.23%. Comparing base (bd53af2) to head (83af249). Report is 73 commits behind head on main.
bd53af2
83af249
Owee, I'm MrMeeseeks, Look at me.
There seem to be a conflict, please backport manually. Here are approximate instructions:
Cherry pick the first parent branch of the this PR on top of the older branch:
You will likely have some merge/cherry-pick conflict here, fix them and commit:
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.