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

[20603] Remove idl parser from .repos file (backport #4535) #4543

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 9, 2024

This is an automatic backport of pull request #4535 done by Mergify.
Cherry-pick of 128d238 has failed:

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

You are currently cherry-picking commit 128d23878.
  (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 <file>..." to mark resolution)
	both modified:   fastrtps.repos

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/pull-requests/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: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit 128d238)

# Conflicts:
#	fastrtps.repos
Copy link
Contributor Author

mergify bot commented Mar 9, 2024

Cherry-pick of 128d238 has failed:

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

You are currently cherry-picking commit 128d23878.
  (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 <file>..." to mark resolution)
	both modified:   fastrtps.repos

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 9, 2024
@mergify mergify bot mentioned this pull request Mar 9, 2024
5 tasks
@EduPonz EduPonz closed this Mar 9, 2024
@mergify mergify bot deleted the mergify/bp/2.6.x/pr-4535 branch March 9, 2024 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants