Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Fix SDK dependencies (bp #8419) #8424

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2020

This is an automated backport of pull request #8419 done by Mergify.io

Cherry-pick of b18e405 has failed:

On branch mergify/bp/v1.0/pr-8419
Your branch is up to date with 'origin/v1.0'.

You are currently cherry-picking commit b18e4057b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   programs/bpf/Cargo.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   sdk/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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
  • @Mergifyio backports <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 simulator.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit b18e405)

# Conflicts:
#	sdk/Cargo.toml
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 25, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 25, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to merge conflict

@mvines
Copy link
Contributor

mvines commented Feb 25, 2020

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Feb 25, 2020

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Fix SDK deps
Using index info to reconstruct a base tree...
M sdk/Cargo.toml
Falling back to patching base and 3-way merge...
Auto-merging sdk/Cargo.toml
CONFLICT (content): Merge conflict in sdk/Cargo.toml
error: Failed to merge in the changes.
Patch failed at 0001 Fix SDK deps
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: D27B1

@mvines
Copy link
Contributor

mvines commented Feb 25, 2020

🥉

@mvines
Copy link
Contributor

mvines commented Feb 25, 2020

df813b3

@mvines mvines closed this Feb 25, 2020
@mvines mvines deleted the mergify/bp/v1.0/pr-8419 branch February 25, 2020 00:31
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants