Skip to content

12 ➡️ 13 (main)#1009

Merged
chapulina merged 5 commits intomainfrom
chapulina/12_to_13
May 9, 2022
Merged

12 ➡️ 13 (main)#1009
chapulina merged 5 commits intomainfrom
chapulina/12_to_13

Conversation

@chapulina
Copy link
Copy Markdown
Contributor

@chapulina chapulina commented May 3, 2022

➡️ Forward port

Port sdf12 to main

Branch comparison: main...sdf12

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

ahcorde and others added 5 commits April 19, 2022 09:44
@ahcorde @adlarkin
USD to SDF: Added Lights attached to models (#903)
2247225 
Signed-off-by: ahcorde <ahcorde@gmail.com>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
@ahcorde @adlarkin
USD to SDF: Added diff drive plugin (#904)
a593db2 
Signed-off-by: ahcorde <ahcorde@gmail.com>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
@ahcorde
USD to SDF: some fixes (#991)
1902c16 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@nkoenig @ahcorde @chapulina
Added equality operators to Plugin (#912)
12e7782 
* Added convenience constructor to plugin

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added equality operators to Plugin

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove common dependency

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
@chapulina
12 ➡️ 13
a8bfc22 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested review from azeey and scpeters as code owners May 3, 2022 15:43
@github-actions github-actions bot added the 🌱 garden Ignition Garden label May 3, 2022
@chapulina chapulina merged commit f3c2704 into main May 9, 2022
@chapulina chapulina deleted the chapulina/12_to_13 branch May 9, 2022 18:54
@scpeters
Copy link
Copy Markdown
Member

scpeters commented May 10, 2022

looks like an accidental squash-merge

@chapulina
Copy link
Copy Markdown
Contributor Author

chapulina commented May 17, 2022

looks like an accidental squash-merge

Are you sure? f3c2704 has 2 parents, I see the individual PR commits in https://github.com/gazebosim/sdformat/commits/main and they're not on the comparison anymore: main...sdf12

@scpeters
Copy link
Copy Markdown
Member

scpeters commented May 17, 2022

looks like an accidental squash-merge

Are you sure? f3c2704 has 2 parents, I see the individual PR commits in https://github.com/gazebosim/sdformat/commits/main and they're not on the comparison anymore: main...sdf12

yeah you're right it was a merge commit. it just looked like a squash merge because the commit message in f3c2704 is a mile long

sorry for the noise

@chapulina
Copy link
Copy Markdown
Contributor Author

chapulina commented May 17, 2022

the commit message in f3c2704 is a mile long

So, I still don't understand how GitHub populates the default commit title and commit message. I seem to get one of various patterns each time. When it's a forward-port and it has all commits listed like that, I leave it like that. But it doesn't do that every time 🤷🏽‍♀️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@azeey azeey azeey approved these changes

@scpeters scpeters Awaiting requested review from scpeters scpeters is a code owner

Assignees

No one assigned

Labels

🌱 garden Ignition Garden

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@chapulina @scpeters @azeey @j-rivero @osrf-triage @ahcorde @nkoenig