Skip to content

Conversation

claraberendsen
Copy link

➡️ Forward port

Port gz-transport13 to gz-transport14

Branch comparison: gz-transport14...claraberendsen:claraberendsen/13_to_14_2024-10-01

Follow up of #517, #518, #521, #522

Disables #195

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Oct 1, 2024
Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
Signed-off-by: claraberendsen <42071084+claraberendsen@users.noreply.github.com>
@claraberendsen claraberendsen force-pushed the claraberendsen/13_to_14_2024-10-01 branch from 83c4bff to 3eaed86 Compare October 1, 2024 15:44
@claraberendsen
Copy link
Author

@azeey it seems on the move to gz-transport14 we missed the commit that disabled playback.ReplayStep.

@claraberendsen claraberendsen changed the title Disable playback.ReplayStep for windows (#517) 13 ➡️ 14 - Disable playback.ReplayStep for windows (#517) Oct 1, 2024
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is a cherry-pick instead of a git merge, I would suggest, using the "Rebase and Merge" button when merging the pull request. Also, I'd remove the 13->14 in the title, since we normally use that for forward merges which use git merge.

@claraberendsen claraberendsen changed the title 13 ➡️ 14 - Disable playback.ReplayStep for windows (#517) Disable playback.ReplayStep for windows (#517) Oct 1, 2024
@claraberendsen
Copy link
Author

claraberendsen commented Oct 1, 2024

@azeey thanks for the comments, I changed the title to match the expectations.
I cannot merge this since I don't have permission so I will let that to the team to do the proper action of rebase and merge since it is a cherry pick.
I can open a new PR that uses git merge if you prefer.

@azeey azeey merged commit 5a18658 into gazebosim:gz-transport14 Oct 1, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏛️ ionic Gazebo Ionic

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants