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

prompt registry and grounding document tutorials #23897

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

I321506
Copy link
Contributor

@I321506 I321506 commented Mar 25, 2025

No description provided.

@rbrainey
Copy link
Contributor

There's two merge conflicts present on this PR. These need to be resolved prior to me being able to publish.

@I321506
Copy link
Contributor Author

I321506 commented Apr 3, 2025

@rbrainey Its resolved. Could you please help to merge? Thanks

@rbrainey
Copy link
Contributor

rbrainey commented Apr 3, 2025

Hi, based on the PR status and a close examination of the merge conflict that called out, the resolution to the conflict isn't part of the PR. There are two merge conflicts called out. The first is trivial. The second doesn't seem to be. Is the resolution commit part of this PR?

Screenshot 2025-04-03 at 3 01 18 PM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants