Resolve conflicts in table.h and index.c#2557
Merged
Merged
Conversation
1) Commit 1d65416 in the file src/include/access/table.h added a declaration of a new function try_table_open with two arguments, while the earlier commit 19cd1cf already added it but with three arguments. 2) Commit a6642b3 in the file src/backend/catalog/index.c in the reindex_relation function changed the warning to an error, while earlier commits 25a9039 and 958a672 had already added GPDB-specific code to the same place.
silent-observer
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
2 participants
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 1d65416 in the file src/include/access/table.h added a
declaration of a new function try_table_open with two arguments, while
the earlier commit 19cd1cf already added it but with three arguments.
Commit a6642b3 in the file src/backend/catalog/index.c in the
reindex_relation function changed the warning to an error, while
earlier commits 25a9039 and 958a672 had already added GPDB-specific
code to the same place.