Resolve conflicts in src/backend/commands/tablecmds.c#2571
Open
RekGRpth wants to merge 3 commits into
Open
Conversation
1) Commit afc7e0a in src/backend/commands/tablecmds.c added a conditional error message in the RemoveRelations function, while earlier commit 64b63f6(d8d378d) had already added a conditional call to the find_all_inheritors function in the same location. 2) Commit 257836a in src/backend/commands/tablecmds.c added handling for the AT_AlterCollationRefreshVersion case in the AlterTableGetLockLevel function, while earlier GPDB-specific commits had already added handling for GPDB-specific cases in the same location. 3) Commit 5b02d68 in src/backend/commands/tablecmds.c added a condition to the ATParseTransformCmd function call for the AT_AddConstraint and AT_AddConstraintRecurse cases and changed the comments. However, the earlier commit 89f85cc had already added a new argument to this function call. 4) Commit 5b02d68 in src/backend/commands/tablecmds.c moved the large switch (cmd2->subtype) in the ATParseTransformCmd function. However, the earlier commit 89f85cc had already added a conditional definition save in the same place.
silent-observer
previously approved these changes
May 22, 2026
silent-observer
approved these changes
May 25, 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 afc7e0a in src/backend/commands/tablecmds.c added a
conditional error message in the RemoveRelations function, while
earlier commit 64b63f6(d8d378d) had already added a conditional call to
the find_all_inheritors function in the same location.
Commit 257836a in src/backend/commands/tablecmds.c added handling
for the AT_AlterCollationRefreshVersion case in the
AlterTableGetLockLevel function, while earlier GPDB-specific commits
had already added handling for GPDB-specific cases in the same
location.
Commit 5b02d68 in src/backend/commands/tablecmds.c added a condition
to the ATParseTransformCmd function call for the AT_AddConstraint and
AT_AddConstraintRecurse cases and changed the comments. However, the
earlier commit 89f85cc had already added a new argument to this
function call.
Commit 5b02d68 in src/backend/commands/tablecmds.c moved the large
switch (cmd2->subtype) in the ATParseTransformCmd function. However,
the earlier commit 89f85cc had already added a conditional definition
save in the same place.