Skip to content

doc_count already exists in parent class #2865

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

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Conversation

l-trotta
Copy link
Contributor

@l-trotta l-trotta commented Sep 6, 2024

as titled

Copy link
Member

@pquentin pquentin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! LGTM. Nice catch, sorry about that.

@l-trotta l-trotta merged commit 34639ba into main Sep 6, 2024
7 checks passed
@l-trotta l-trotta deleted the remove-duplicate-field branch September 6, 2024 09:43
Copy link
Contributor

github-actions bot commented Sep 6, 2024

The backport to 8.15 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.15 8.15
# Navigate to the new working tree
cd .worktrees/backport-8.15
# Create a new branch
git switch --create backport-2865-to-8.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 34639bac3e3b799e55b45e3a59577fb54c63ee0b
# Push it to GitHub
git push --set-upstream origin backport-2865-to-8.15
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.15

Then, create a pull request where the base branch is 8.15 and the compare/head branch is backport-2865-to-8.15.

@pquentin
Copy link
Member

pquentin commented Sep 6, 2024

Backported via #2869.

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