Resolve conflicts in defrem.h, parsenodes.h, indexcmds.c, utility.c#2561
Open
silent-observer wants to merge 1 commit into
Open
Resolve conflicts in defrem.h, parsenodes.h, indexcmds.c, utility.c#2561silent-observer wants to merge 1 commit into
silent-observer wants to merge 1 commit into
Conversation
1. Commit a6642b3 removed "concurrent" field from ReindexStmt and switched to using bitflags. Update the rest of the code. 2. Commit a6642b3 added topLevel argument, however this commit was already cherry-picked as 67a7c0f, but using "concurrent" argument, and without REINDEXOPT_MISSING_OK option added in 1d65416, and also without the fix from commit d1b0007.
RekGRpth
approved these changes
May 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit a6642b3 removed "concurrent" field
from ReindexStmt and switched to using bitflags. Update the rest of the code.
Commit a6642b3 added topLevel argument,
however this commit was already cherry-picked as
67a7c0f, but using "concurrent" argument, and
without REINDEXOPT_MISSING_OK option added in
1d65416, and also without the fix from commit d1b0007.