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

Tf2 tutorial minor fixups (backport #4360) #4367

Merged
merged 1 commit into from
May 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 6, 2024

Notices some inconsistencies when testing the tf2 tutorials for Jazzy

This does not fix the broken parts of Learning-About-Tf2-And-Time-Py.rst -> #3960


This is an automatic backport of pull request #4360 done by [Mergify](https://mergify.com).

@mergify mergify bot requested review from clalancette and audrow as code owners May 6, 2024 13:31
@mergify mergify bot added the conflicts label May 6, 2024
Copy link
Contributor Author

mergify bot commented May 6, 2024

Cherry-pick of 98ae453 has failed:

On branch mergify/bp/humble/pr-4360
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 98ae4535.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Py.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Py.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Py.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

* explicitely put file name to homogenize, fix snippet coloration

* create launch folder, fix tf2_echo output, callout filename explicitely to homogenize, fix tutrle topic name

* 4-space indent in python snippets

Signed-off-by: Mikael Arguedas <[email protected]>
(cherry picked from commit 98ae453)
@clalancette clalancette merged commit 2ca048f into humble May 6, 2024
4 checks passed
@clalancette clalancette deleted the mergify/bp/humble/pr-4360 branch May 6, 2024 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants