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

install package manifest #159

Merged
merged 1 commit into from
Sep 16, 2019
Merged

install package manifest #159

merged 1 commit into from
Sep 16, 2019

Conversation

ruffsl
Copy link
Member

@ruffsl ruffsl commented Sep 15, 2019

sros2/setup.py Outdated Show resolved Hide resolved
Signed-off-by: ruffsl <roxfoxpox@gmail.com>
Copy link
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

Linux: Build Status

@ruffsl
Copy link
Member Author

ruffsl commented Sep 16, 2019

Merging, as https://ci.ros2.org/job/ci_linux/8142/ is passing.

@ruffsl ruffsl merged commit 3689472 into master Sep 16, 2019
@delete-merged-branch delete-merged-branch bot deleted the ruffsl/install-manifest branch September 16, 2019 18:21
@jacobperron
Copy link
Member

Sorry for the delay.

@ruffsl Please do a squash-merge or rebase-merge next time to avoid an extra merge commit.

@ruffsl
Copy link
Member Author

ruffsl commented Sep 16, 2019

Please do a squash-merge or rebase-merge next time to avoid an extra merge commit.

Can you set that as the default option for the repo in the github repo settings?
It's not apparent which megre style is prefered for every github repo otherwise.

@jacobperron
Copy link
Member

I've updated the settings to disallow merge commits. I'm not sure if there's a reason we don't do this across the org, so I'll only touch the settings for this repo for now.

@mjcarroll
Copy link
Member

I know that in some cases we don't do squash-merge to preserve the history. The case that comes to mind is if there is a commit that represents a copy from somewhere else, and then additional commits for modifications to that copy.

It should also default to the last one that you used on that repository.

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