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.

Sign up for GitHub

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

Jump to bottom

Add amendment for world merge-include #86

Merged
merged 6 commits into from
Feb 17, 2023
Merged

Add amendment for world merge-include #86

merged 6 commits into from
Feb 17, 2023

Conversation

azeey
Copy link
Collaborator

@azeey azeey commented Feb 7, 2023 •
edited
Loading

🎉 New feature

Summary

Extends model merge-include to worlds. The merge mechanism should be exactly the same except the type of elements that are allowed to be merged.

Preview

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

@azeey
Add amendment for world merge-include
52797e7 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey self-assigned this Feb 7, 2023
@azeey azeey requested a review from scpeters February 7, 2023 22:23
@azeey
Fix typo and formatting
eee99fd 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Fix example
4acb8b0 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Change world name
eb5d2b7 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey mentioned this pull request Feb 8, 2023
Merged
8 tasks
aaronchongth
aaronchongth approved these changes Feb 15, 2023
View reviewed changes
Copy link
Collaborator

@aaronchongth aaronchongth left a comment

Choose a reason for hiding this comment

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

LGTM!

@azeey
Add reviewer feedback
6f79a8a 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
scpeters
scpeters approved these changes Feb 17, 2023
View reviewed changes
Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

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

LGTM after one more grammar change

composition/merge_proposal.md Outdated Show resolved Hide resolved
@azeey
Grammar
e5a2827 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey merged commit 50f7583 into master Feb 17, 2023
@azeey azeey deleted the azeey/world_merge_include branch February 17, 2023 21:34
azeey added a commit to gazebosim/sdformat that referenced this pull request Feb 17, 2023
@azeey @scpeters
Add support for merge-includes in worlds (#1233)
ef76fef 
Implements merge-includes for worlds as discussed in gazebosim/sdf_tutorials#86. 

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scpeters scpeters scpeters approved these changes

@aaronchongth aaronchongth aaronchongth approved these changes

Assignees

@azeey azeey

Labels
None yet
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@azeey @scpeters @aaronchongth