Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 11, 2024

(cherry picked from commit d48f0cb)

# Conflicts:
#	README.md
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 11, 2024
@mergify mergify bot assigned lcawl Jun 11, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Jun 11, 2024

Cherry-pick of d48f0cb has failed:

On branch mergify/bp/7.17/pr-3985
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit d48f0cbf.
  (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:
	new file:   LICENSE

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   README.md

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
Copy link
Contributor Author

mergify bot commented Jun 17, 2024

This pull request has not been merged yet. Could you please review and merge it @lcawl? 🙏

@bmorelli25 bmorelli25 merged commit 2453e21 into 7.17 Jun 17, 2024
@bmorelli25 bmorelli25 deleted the mergify/bp/7.17/pr-3985 branch June 17, 2024 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants