ALTER TABLE: warn when actions do not recurse to partitions

Applying: ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
M	src/include/nodes/parsenodes.h
M	src/test/regress/expected/alter_table.out
M	src/test/regress/expected/cluster.out
A	src/test/regress/expected/graph_table_rls.out
A	src/test/regress/expected/partition_merge.out
A	src/test/regress/expected/partition_split.out
M	src/test/regress/expected/privileges.out
M	src/test/regress/expected/rowsecurity.out
M	src/test/regress/sql/alter_table.sql
M	src/test/regress/sql/cluster.sql
A	src/test/regress/sql/graph_table_rls.sql
A	src/test/regress/sql/partition_merge.sql
A	src/test/regress/sql/partition_split.sql
M	src/test/regress/sql/privileges.sql
M	src/test/regress/sql/rowsecurity.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/rowsecurity.sql
Auto-merging src/test/regress/sql/privileges.sql
CONFLICT (modify/delete): src/test/regress/sql/partition_split.sql deleted in HEAD and modified in ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs. Version ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs of src/test/regress/sql/partition_split.sql left in tree.
CONFLICT (modify/delete): src/test/regress/sql/partition_merge.sql deleted in HEAD and modified in ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs. Version ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs of src/test/regress/sql/partition_merge.sql left in tree.
CONFLICT (modify/delete): src/test/regress/sql/graph_table_rls.sql deleted in HEAD and modified in ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs. Version ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs of src/test/regress/sql/graph_table_rls.sql left in tree.
Auto-merging src/test/regress/sql/cluster.sql
Auto-merging src/test/regress/sql/alter_table.sql
Auto-merging src/test/regress/expected/rowsecurity.out
Auto-merging src/test/regress/expected/privileges.out
CONFLICT (modify/delete): src/test/regress/expected/partition_split.out deleted in HEAD and modified in ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs. Version ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs of src/test/regress/expected/partition_split.out left in tree.
CONFLICT (modify/delete): src/test/regress/expected/partition_merge.out deleted in HEAD and modified in ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs. Version ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs of src/test/regress/expected/partition_merge.out left in tree.
CONFLICT (modify/delete): src/test/regress/expected/graph_table_rls.out deleted in HEAD and modified in ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs. Version ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs of src/test/regress/expected/graph_table_rls.out left in tree.
Auto-merging src/test/regress/expected/cluster.out
Auto-merging src/test/regress/expected/alter_table.out
Auto-merging src/include/nodes/parsenodes.h
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Patch failed at 0001 ALTER TABLE: emit NOTICE when ONLY is omitted but no partition recursion occurs

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"