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

Fix atomic 64 b description (backport #17) #19

Merged
merged 2 commits into from
Apr 26, 2022
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 26, 2022

This is an automatic backport of pull request #17 done by Mergify.
Cherry-pick of 85efa4a has failed:

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

You are currently cherry-picking commit 85efa4a.
  (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:   CMakeLists.txt

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

(cherry picked from commit 85efa4a)

# Conflicts:
#	CMakeLists.txt
@mergify mergify bot added the conflicts label Apr 26, 2022
@mergify mergify bot mentioned this pull request Apr 26, 2022
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9 pablogs9 merged commit 3a007d2 into foxy Apr 26, 2022
@pablogs9 pablogs9 deleted the mergify/bp/foxy/pr-17 branch April 26, 2022 06:02
pablogs9 added a commit that referenced this pull request May 30, 2022
* Fix atomic 64 b description (#17)

(cherry picked from commit 85efa4a)

# Conflicts:
#	CMakeLists.txt

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
pablogs9 added a commit that referenced this pull request Jul 26, 2022
* Fix atomic 64 b description (#17)

(cherry picked from commit 85efa4a)

# Conflicts:
#	CMakeLists.txt

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
pablogs9 added a commit that referenced this pull request Oct 3, 2022
* Fix atomic 64 b description (#17)

(cherry picked from commit 85efa4a)

# Conflicts:
#	CMakeLists.txt

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
pablogs9 added a commit that referenced this pull request Mar 17, 2023
* Fix atomic 64 b description (#17)

(cherry picked from commit 85efa4a)

# Conflicts:
#	CMakeLists.txt

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant