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

Update to mmtk-core PR #1205 (backport #177) #178

Open
wants to merge 1 commit into
base: v1.9.2+RAI
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 27, 2024


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

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

# Conflicts:
#	mmtk/Cargo.lock
#	mmtk/Cargo.toml
@mergify mergify bot added the backport-conflicts The backport pull request has conflicts (automatically added by mergify) label Sep 27, 2024
Copy link
Author

mergify bot commented Sep 27, 2024

Cherry-pick of 5d07e8f has failed:

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

You are currently cherry-picking commit 5d07e8f.
  (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:   mmtk/src/api.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mmtk/Cargo.lock
	both modified:   mmtk/Cargo.toml

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

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.

1 participant