Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Sep 6, 2021

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

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

You are currently cherry-picking commit a76caed.
  (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:   src/shared_library.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/filesystem.c

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.io/

* Avoid not used warnings

* Update

(cherry picked from commit a76caed)

# Conflicts:
#	src/filesystem.c
@mergify mergify bot added the conflicts label Sep 6, 2021
@mergify mergify bot mentioned this pull request Sep 6, 2021
@pablogs9 pablogs9 closed this Sep 6, 2021
@pablogs9 pablogs9 deleted the mergify/bp/foxy/pr-10 branch September 6, 2021 14:22
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