[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
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

Update maintainers (backport #362) #370

Merged
merged 2 commits into from
Dec 23, 2021
Merged

Conversation

mergify[bot]
Copy link
@mergify mergify bot commented Dec 8, 2021

This is an automatic backport of pull request #362 done by Mergify.
Cherry-pick of 9bcc813 has failed:

On branch mergify/bp/galactic/pr-362
Your branch is up to date with 'origin/galactic'.

You are currently cherry-picking commit 9bcc813.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ament_cmake/package.xml
	both modified:   ament_cmake_auto/package.xml
	both modified:   ament_cmake_core/package.xml
	both modified:   ament_cmake_export_definitions/package.xml
	both modified:   ament_cmake_export_dependencies/package.xml
	both modified:   ament_cmake_export_include_directories/package.xml
	both modified:   ament_cmake_export_interfaces/package.xml
	both modified:   ament_cmake_export_libraries/package.xml
	both modified:   ament_cmake_export_link_flags/package.xml
	both modified:   ament_cmake_export_targets/package.xml
	deleted by us:   ament_cmake_gen_version_h/package.xml
	both modified:   ament_cmake_gmock/package.xml
	both modified:   ament_cmake_google_benchmark/package.xml
	both modified:   ament_cmake_gtest/package.xml
	both modified:   ament_cmake_include_directories/package.xml
	both modified:   ament_cmake_libraries/package.xml
	both modified:   ament_cmake_nose/package.xml
	both modified:   ament_cmake_pytest/package.xml
	both modified:   ament_cmake_python/package.xml
	both modified:   ament_cmake_target_dependencies/package.xml
	both modified:   ament_cmake_test/package.xml
	both modified:   ament_cmake_version/package.xml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: Audrow Nash <audrow@hey.com>
(cherry picked from commit 9bcc813)

# Conflicts:
#	ament_cmake/package.xml
#	ament_cmake_auto/package.xml
#	ament_cmake_core/package.xml
#	ament_cmake_export_definitions/package.xml
#	ament_cmake_export_dependencies/package.xml
#	ament_cmake_export_include_directories/package.xml
#	ament_cmake_export_interfaces/package.xml
#	ament_cmake_export_libraries/package.xml
#	ament_cmake_export_link_flags/package.xml
#	ament_cmake_export_targets/package.xml
#	ament_cmake_gen_version_h/package.xml
#	ament_cmake_gmock/package.xml
#	ament_cmake_google_benchmark/package.xml
#	ament_cmake_gtest/package.xml
#	ament_cmake_include_directories/package.xml
#	ament_cmake_libraries/package.xml
#	ament_cmake_nose/package.xml
#	ament_cmake_pytest/package.xml
#	ament_cmake_python/package.xml
#	ament_cmake_target_dependencies/package.xml
#	ament_cmake_test/package.xml
#	ament_cmake_version/package.xml
@mergify mergify bot added the conflicts label Dec 8, 2021
@mergify mergify bot mentioned this pull request Dec 8, 2021
Signed-off-by: Scott K Logan <logans@cottsay.net>
@cottsay cottsay force-pushed the mergify/bp/galactic/pr-362 branch from 63281c8 to afb8850 Compare December 8, 2021 23:58
@clalancette clalancette merged commit 632a64b into galactic Dec 23, 2021
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/galactic/pr-362 branch December 23, 2021 16:29
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