Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented May 22, 2024

Parent PR: mmtk/mmtk-core#1134


This is an automatic backport of pull request #150 done by Mergify.

Parent PR: mmtk/mmtk-core#1134

---------

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

# Conflicts:
#	mmtk/Cargo.lock
#	mmtk/Cargo.toml
#	mmtk/src/api.rs
#	mmtk/src/julia_scanning.rs
#	mmtk/src/lib.rs
#	mmtk/src/scanning.rs
#	mmtk/src/slots.rs
@mergify mergify bot added the backport-conflicts The backport pull request has conflicts (automatically added by mergify) label May 22, 2024
@mergify mergify bot assigned wks May 22, 2024
@mergify
Copy link
Author

mergify bot commented May 22, 2024

Cherry-pick of e776c41 has failed:

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

You are currently cherry-picking commit e776c41.
  (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:   julia/mmtk_julia.c
	modified:   mmtk/api/mmtk.h
	deleted:    mmtk/src/edges.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mmtk/Cargo.lock
	both modified:   mmtk/Cargo.toml
	both modified:   mmtk/src/api.rs
	both modified:   mmtk/src/julia_scanning.rs
	both modified:   mmtk/src/lib.rs
	both modified:   mmtk/src/scanning.rs
	both modified:   mmtk/src/slots.rs

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

@qinsoon qinsoon assigned qinsoon and unassigned wks May 22, 2024
@qinsoon
Copy link
Member

qinsoon commented May 22, 2024

We should back port #146 first.

@qinsoon qinsoon closed this May 22, 2024
@mergify mergify bot deleted the mergify/bp/v1.9.2+RAI/pr-150 branch May 22, 2024 06:04
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.

3 participants