Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: automated update of tutorials #2942

Merged
merged 2 commits into from
Aug 19, 2024
Merged

docs: automated update of tutorials #2942

merged 2 commits into from
Aug 19, 2024

Conversation

github-actions[bot]
Copy link
Contributor

automated update of tutorials submodule

@ori-kron-wis ori-kron-wis self-assigned this Aug 19, 2024
@ori-kron-wis ori-kron-wis added on-merge: backport to 1.1.x on-merge: backport to 1.1.x on-merge: backport to 1.2.x on-merge: backport to 1.2.x labels Aug 19, 2024
Copy link

codecov bot commented Aug 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.31%. Comparing base (6a9f311) to head (11acb63).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2942   +/-   ##
=======================================
  Coverage   85.31%   85.31%           
=======================================
  Files         167      167           
  Lines       14385    14385           
=======================================
  Hits        12272    12272           
  Misses       2113     2113           

@ori-kron-wis ori-kron-wis self-requested a review August 19, 2024 13:58
@ori-kron-wis ori-kron-wis merged commit 659e387 into main Aug 19, 2024
22 checks passed
Copy link

lumberbot-app bot commented Aug 19, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.1.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 659e38764d33f85714d71f2858d2d705bae280a3
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2942: docs: automated update of tutorials'
  1. Push to a named branch:
git push YOURFORK 1.1.x:auto-backport-of-pr-2942-on-1.1.x
  1. Create a PR against branch 1.1.x, I would have named this PR:

"Backport PR #2942 on branch 1.1.x (docs: automated update of tutorials)"

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.

Copy link

lumberbot-app bot commented Aug 19, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.2.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 659e38764d33f85714d71f2858d2d705bae280a3
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2942: docs: automated update of tutorials'
  1. Push to a named branch:
git push YOURFORK 1.2.x:auto-backport-of-pr-2942-on-1.2.x
  1. Create a PR against branch 1.2.x, I would have named this PR:

"Backport PR #2942 on branch 1.2.x (docs: automated update of tutorials)"

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant