Resolve conflicts in src/bin/psql/describe.c#2606
Merged
Merged
Conversation
1) Commit 07f386e in the file src/bin/psql/describe.c added an element to the translate_columns array in the listTables function, while the earlier commit 1e11aaf already added two elements and a comment to the same array. 2) Commit 07f386e in the file src/bin/psql/describe.c added a conditional join pg_catalog.pg_am to the listTables function, while the earlier commit 4b98e91 already did this, but for different conditions.
silent-observer
approved these changes
May 28, 2026
bimboterminator1
approved these changes
May 28, 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
3 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 07f386e in the file src/bin/psql/describe.c added an element
to the translate_columns array in the listTables function, while the
earlier commit 1e11aaf already added two elements and a comment to the
same array.
Commit 07f386e in the file src/bin/psql/describe.c added a
conditional join pg_catalog.pg_am to the listTables function, while the
earlier commit 4b98e91 already did this, but for different conditions.