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

Cleanup the tf2 tutorials (backport #4056) #4060

Merged
merged 1 commit into from
Dec 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2023

This is an automatic backport of pull request #4056 done by Mergify.
Cherry-pick of 7f369d3 has failed:

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

You are currently cherry-picking commit 7f369d34.
  (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/Introduction-To-Tf2.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Cpp.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Py.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Cpp.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Py.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.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/Adding-A-Frame-Cpp.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Py.rst

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from clalancette and audrow as code owners December 11, 2023 13:41
@mergify mergify bot added the conflicts label Dec 11, 2023
* Cleanup Introduction to Tf2.

In particular, make it less Linux centric.  Also cleanup
a few typos I noticed while reading.  And finally, change
the packages we install to be the ones actually needed
by the tutorial nowadays.

* Cleanup Writing-A-Tf2-Broadcaster-* tutorials.

Just make the C++ and the Python one a little more similar,
and fix a few minor typos.

* Minor cleanup in Writing-A-Tf2-Static-Broadcaster-* tutorials.

* Small cleanups in the Writing-A-Tf2-Listener tutorials.

Make the Python and C++ tutorials more alike.

* Minor updates to the Adding-A-Frame tutorials.

Just to make the Python and C++ tutorials more similar.

Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit 7f369d3)
@clalancette clalancette force-pushed the mergify/bp/humble/pr-4056 branch from 5884284 to 4ec7c30 Compare December 11, 2023 13:54
@clalancette clalancette merged commit 8d18c16 into humble Dec 11, 2023
3 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-4056 branch December 11, 2023 13:58
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.

1 participant