Skip to content

Remove atomic patch (backport #329)#332

Merged
Amronos merged 2 commits intojazzyfrom
mergify/bp/jazzy/pr-329
Apr 29, 2026
Merged

Remove atomic patch (backport #329)#332
Amronos merged 2 commits intojazzyfrom
mergify/bp/jazzy/pr-329

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Apr 29, 2026

Co-authored-by: Narukara narukara17@gmail.com (@Narukara)

Fixes #251.

For information about the change, look at #328 (comment).


This is part 1 of 4 in a stack made with GitButler:

Changes specific to this PR: cf037b2


This is an automatic backport of pull request #329 done by [Mergify](https://mergify.com).

Co-authored-by: Narukara <narukara17@gmail.com>
(cherry picked from commit a5bf105)

# Conflicts:
#	libmicroros.mk
@mergify mergify Bot added the conflicts label Apr 29, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 29, 2026

Cherry-pick of a5bf105 has failed:

On branch mergify/bp/jazzy/pr-329
Your branch is up to date with 'origin/jazzy'.

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

@Amronos
Copy link
Copy Markdown
Member

Amronos commented Apr 29, 2026

@Narukara could you fix the conflicts in this and the other backport PR?

@Narukara
Copy link
Copy Markdown
Contributor

These CI failures should be fixed by #325

@Amronos Amronos merged commit 56a664a into jazzy Apr 29, 2026
11 of 17 checks passed
@Amronos Amronos deleted the mergify/bp/jazzy/pr-329 branch April 29, 2026 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants