Skip to content

[20215] Update PR checklist template. Backports and Description (backport #4215)#4222

Merged
JesusPoderoso merged 1 commit into2.11.xfrom
mergify/bp/2.11.x/pr-4215
Jan 10, 2024
Merged

[20215] Update PR checklist template. Backports and Description (backport #4215)#4222
JesusPoderoso merged 1 commit into2.11.xfrom
mergify/bp/2.11.x/pr-4215

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 10, 2024

This is an automatic backport of pull request #4215 done by Mergify.
Cherry-pick of dbbb465 has failed:

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

You are currently cherry-picking commit dbbb46532.
  (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:   .github/pull_request_template.md

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 10, 2024
@EduPonz EduPonz added this to the v2.11.3 milestone Jan 10, 2024
…kports (#4215)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit dbbb465)
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.11.x/pr-4215 branch from 2222ff9 to 9505c95 Compare January 10, 2024 07:12
@JesusPoderoso JesusPoderoso added skip-ci Automatically pass CI and removed conflicts Backport PR wich git cherry pick failed labels Jan 10, 2024
@JesusPoderoso JesusPoderoso reopened this Jan 10, 2024
@JesusPoderoso JesusPoderoso merged commit f937405 into 2.11.x Jan 10, 2024
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.11.x/pr-4215 branch January 10, 2024 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-ci Automatically pass CI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants