Re: logical replication syntax (was DROP SUBSCRIPTION, query cancellations and slot handling)

Applying: Rework the options for logical replication
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/alter_publication.sgml
M	doc/src/sgml/ref/alter_subscription.sgml
M	doc/src/sgml/ref/create_publication.sgml
M	doc/src/sgml/ref/create_subscription.sgml
M	src/backend/commands/publicationcmds.c
M	src/backend/commands/subscriptioncmds.c
M	src/backend/parser/gram.y
M	src/bin/pg_dump/pg_dump.c
M	src/bin/pg_dump/t/002_pg_dump.pl
A	src/bin/psql/tab-complete.c
M	src/include/parser/kwlist.h
M	src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
M	src/test/modules/dummy_seclabel/sql/dummy_seclabel.sql
M	src/test/regress/expected/object_address.out
M	src/test/regress/expected/publication.out
M	src/test/regress/expected/subscription.out
M	src/test/regress/sql/object_address.sql
M	src/test/regress/sql/publication.sql
M	src/test/regress/sql/subscription.sql
M	src/test/subscription/t/001_rep_changes.pl
M	src/test/subscription/t/002_types.pl
M	src/test/subscription/t/003_constraints.pl
M	src/test/subscription/t/004_sync.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/subscription/t/004_sync.pl
CONFLICT (content): Merge conflict in src/test/subscription/t/004_sync.pl
Auto-merging src/test/subscription/t/003_constraints.pl
CONFLICT (content): Merge conflict in src/test/subscription/t/003_constraints.pl
Auto-merging src/test/subscription/t/002_types.pl
CONFLICT (content): Merge conflict in src/test/subscription/t/002_types.pl
Auto-merging src/test/subscription/t/001_rep_changes.pl
CONFLICT (content): Merge conflict in src/test/subscription/t/001_rep_changes.pl
Auto-merging src/test/regress/sql/subscription.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/subscription.sql
Auto-merging src/test/regress/sql/publication.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/publication.sql
Auto-merging src/test/regress/sql/object_address.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/object_address.sql
Auto-merging src/test/regress/expected/subscription.out
CONFLICT (content): Merge conflict in src/test/regress/expected/subscription.out
Auto-merging src/test/regress/expected/publication.out
CONFLICT (content): Merge conflict in src/test/regress/expected/publication.out
Auto-merging src/test/regress/expected/object_address.out
CONFLICT (content): Merge conflict in src/test/regress/expected/object_address.out
Auto-merging src/test/modules/dummy_seclabel/sql/dummy_seclabel.sql
Auto-merging src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
Auto-merging src/include/parser/kwlist.h
CONFLICT (content): Merge conflict in src/include/parser/kwlist.h
CONFLICT (modify/delete): src/bin/psql/tab-complete.c deleted in HEAD and modified in Rework the options for logical replication. Version Rework the options for logical replication of src/bin/psql/tab-complete.c left in tree.
Auto-merging src/bin/pg_dump/t/002_pg_dump.pl
CONFLICT (content): Merge conflict in src/bin/pg_dump/t/002_pg_dump.pl
Auto-merging src/bin/pg_dump/pg_dump.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.c
Auto-merging src/backend/parser/gram.y
CONFLICT (content): Merge conflict in src/backend/parser/gram.y
Auto-merging src/backend/commands/subscriptioncmds.c
CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c
Auto-merging src/backend/commands/publicationcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/publicationcmds.c
Auto-merging doc/src/sgml/ref/create_subscription.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/create_subscription.sgml
Auto-merging doc/src/sgml/ref/create_publication.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/create_publication.sgml
Auto-merging doc/src/sgml/ref/alter_subscription.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/alter_subscription.sgml
Auto-merging doc/src/sgml/ref/alter_publication.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/alter_publication.sgml
Patch failed at 0001 Rework the options for logical replication

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"