-
Notifications
You must be signed in to change notification settings - Fork 45
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
Conversation
f46f1ff
to
9e7bfbc
Compare
Signed-off-by: ruffsl <roxfoxpox@gmail.com>
9e7bfbc
to
db5138e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merging, as https://ci.ros2.org/job/ci_linux/8142/ is passing. |
Sorry for the delay. @ruffsl 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? |
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. |
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. |
For osrf/docker_images#317.