Closed mergify[bot] closed 3 months ago
Cherry-pick of 7cbeb21dc67c416c5afcdc22df00c550b2c2cb92 has failed:
On branch mergify/bp/1.4.x/pr-141
Your branch is up to date with 'origin/1.4.x'.
You are currently cherry-picking commit 7cbeb21.
(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: fastdds_python/test/api/test_qos.py
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: fastdds_python/src/swig/fastdds/dds/core/policy/QosPolicies.i
both modified: fastdds_python/src/swig/fastrtps/utils/collections/ResourceLimitedVector.i
both modified: fastdds_python/test/api/test_domainparticipant.py
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
Description
Fixes next message:
@Mergifyio backport 1.4.x 1.2.x
Contributor Checklist
Reviewer Checklist
This is an automatic backport of pull request #141 done by Mergify.