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

Populate Template field from Elasticsearch recipe #17195

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

MikeAlhayek
Copy link
Member

No description provided.

@MikeAlhayek MikeAlhayek enabled auto-merge (squash) December 9, 2024 20:18
@MikeAlhayek MikeAlhayek merged commit fdc39f2 into main Dec 9, 2024
8 checks passed
@MikeAlhayek MikeAlhayek deleted the ma/fix-elasticsearch-handler branch December 9, 2024 20:26
@MikeAlhayek
Copy link
Member Author

/backport to release/2.1

Copy link
Contributor

github-actions bot commented Dec 9, 2024

Copy link
Contributor

github-actions bot commented Dec 9, 2024

@MikeAlhayek backporting to release/2.1 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Populate Template field from Elasticsearch recipe
Using index info to reconstruct a base tree...
M	src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticsearchQueryHandler.cs
Falling back to patching base and 3-way merge...
Auto-merging src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticsearchQueryHandler.cs
CONFLICT (content): Merge conflict in src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticsearchQueryHandler.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Populate Template field from Elasticsearch recipe
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

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.

1 participant