Remove atomic patch #329
Merged
Remove atomic patch #329
Mergify / Rule: Backport to humble at the reviewer's discretion (backport)
succeeded
Apr 29, 2026 in 0s
Backports have been created
- #331 Remove atomic patch (backport #329) has been created for branch
humblebut encountered conflicts
Cherry-pick of a5bf105 has failed:
On branch mergify/bp/humble/pr-329
Your branch is up to date with 'origin/humble'.
You are currently cherry-picking commit a5bf105.
(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: colcon.meta
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: libmicroros.mk
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
Loading