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

Upstream patches applied during Debian packaging of 0.6.1 #517

Merged
merged 3 commits into from
Dec 31, 2020
Merged

Upstream patches applied during Debian packaging of 0.6.1 #517

merged 3 commits into from
Dec 31, 2020

Conversation

jamiesnape
Copy link
Contributor

@jamiesnape jamiesnape commented Dec 17, 2020

Relates #474 (comment). Do not squash the three commits.


This change is Reviewable

Copy link
Member

@sherm1 sherm1 left a comment

Choose a reason for hiding this comment

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

+@sherm1
Thanks, Jamie! :lgtm:

Reviewed 4 of 4 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @jamiesnape)

@sherm1
Copy link
Member

sherm1 commented Dec 17, 2020

The fcl repo only allows squash-merge -- @jamiesnape how important is it to keep the commits separate?

@jamiesnape
Copy link
Contributor Author

jamiesnape commented Dec 18, 2020

They are distinct downstream patches, so they should be separate for history and attribution.

@sherm1 sherm1 merged commit b2a749f into flexible-collision-library:master Dec 31, 2020
@sherm1
Copy link
Member

sherm1 commented Dec 31, 2020

OK, temporarily enabled merge commit to preserve the individual commits.

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.

3 participants