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 replacement order (backport #2300) #2320

Merged
merged 5 commits into from
Dec 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

We need to replace the ...HEAD before adding the new [unreleased] link, otherwise the ...HEAD replacement finds two matches and fails.


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

chipshort and others added 4 commits December 16, 2024 10:34
(cherry picked from commit 55ee235)

# Conflicts:
#	packages/vm/Cargo.toml
(cherry picked from commit 38fea3a)

# Conflicts:
#	packages/vm/Cargo.toml
(cherry picked from commit 09f45bc)

# Conflicts:
#	.taplo.toml
(cherry picked from commit 961abe6)

# Conflicts:
#	packages/vm/Cargo.toml
@mergify mergify bot added the conflicts label Dec 16, 2024
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of 55ee235 has failed:

On branch mergify/bp/release/2.1/pr-2300
Your branch is up to date with 'origin/release/2.1'.

You are currently cherry-picking commit 55ee235b.
  (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:   packages/vm/Cargo.toml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 38fea3a has failed:

On branch mergify/bp/release/2.1/pr-2300
Your branch is ahead of 'origin/release/2.1' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 38fea3a7.
  (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:   packages/vm/Cargo.toml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 09f45bc has failed:

On branch mergify/bp/release/2.1/pr-2300
Your branch is ahead of 'origin/release/2.1' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 09f45bc3.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .taplo.toml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 961abe6 has failed:

On branch mergify/bp/release/2.1/pr-2300
Your branch is ahead of 'origin/release/2.1' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 961abe68.
  (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:   packages/vm/Cargo.toml

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 mergify bot mentioned this pull request Dec 16, 2024
@chipshort chipshort merged commit 78400fa into release/2.1 Dec 16, 2024
32 checks passed
@chipshort chipshort deleted the mergify/bp/release/2.1/pr-2300 branch December 16, 2024 13: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.

1 participant