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

Examples fix: delete topic after endpoint (backport #3558) #3564

Merged
merged 1 commit into from
Jun 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2023

This is an automatic backport of pull request #3558 done by Mergify.
Cherry-pick of 5f2621c has failed:

On branch mergify/bp/2.6.x/pr-3558
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 5f2621ceb.
  (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)

Changes to be committed:
	modified:   examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationSubscriber.cpp

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 2, 2023
@mergify mergify bot mentioned this pull request Jun 2, 2023
9 tasks
@JLBuenoLopez
Copy link
Contributor

@juanlofer-eprosima, this backport has conflicts. Can you take a look and fix them? Thanks!

@JLBuenoLopez JLBuenoLopez added this to the v2.6.5 milestone Jun 5, 2023
Signed-off-by: Juan López Fernández <[email protected]>
(cherry picked from commit 5f2621c)

# Conflicts:
#	examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationSubscriber.cpp
@juanlofer-eprosima juanlofer-eprosima force-pushed the mergify/bp/2.6.x/pr-3558 branch from c0d7a49 to ac7fe0d Compare June 5, 2023 07:39
@juanlofer-eprosima juanlofer-eprosima added the no-test Skip CI tests if PR marked with this label label Jun 5, 2023
@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed conflicts Backport PR wich git cherry pick failed labels Jun 5, 2023
@EduPonz EduPonz merged commit b06c377 into 2.6.x Jun 6, 2023
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-3558 branch June 6, 2023 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-test Skip CI tests if PR marked with this label ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants