Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 11, 2024

(cherry picked from commit 6696f32)

# Conflicts:
#	README.md
@mergify
Copy link
Contributor Author

mergify bot commented Jun 11, 2024

Cherry-pick of 6696f32 has failed:

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

You are currently cherry-picking commit 6696f325.
  (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? 🙏

2 similar comments
@mergify
Copy link
Contributor Author

mergify bot commented Jun 24, 2024

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

@mergify
Copy link
Contributor Author

mergify bot commented Jul 1, 2024

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

@kilfoyle kilfoyle merged commit aa9d281 into 7.17 Jul 2, 2024
@mergify mergify bot deleted the mergify/bp/7.17/pr-1121 branch July 2, 2024 13:55
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.

2 participants