Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 7, 2024

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

On branch mergify/bp/v1.8.2+RAI/pr-126
Your branch is up to date with 'origin/v1.8.2+RAI'.

You are currently cherry-picking commit eac7e88.
  (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:   mmtk/Cargo.lock
	both modified:   mmtk/Cargo.toml
	both modified:   mmtk/api/mmtk.h
	both modified:   mmtk/src/api.rs
	both modified:   mmtk/src/collection.rs

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/pull-requests/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

Upstream PR: mmtk/mmtk-core#1075
Julia PR: mmtk/julia#35

---------

Co-authored-by: mmtkgc-bot <[email protected]>
(cherry picked from commit eac7e88)

# Conflicts:
#	mmtk/Cargo.lock
#	mmtk/Cargo.toml
#	mmtk/api/mmtk.h
#	mmtk/src/api.rs
#	mmtk/src/collection.rs
@mergify mergify bot added the backport-conflicts The backport pull request has conflicts (automatically added by mergify) label Feb 7, 2024
@mergify mergify bot assigned udesou Feb 7, 2024
@udesou udesou closed this Feb 8, 2024
@udesou
Copy link
Contributor

udesou commented Feb 8, 2024

Closed since we're not maintaining v1.8.2+RAI anymore.

@mergify mergify bot deleted the mergify/bp/v1.8.2+RAI/pr-126 branch February 8, 2024 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-conflicts The backport pull request has conflicts (automatically added by mergify)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants