Reduce logical WAL volume with restricted replication slots

Applying: Support selective logical WAL for restricted replication slots
Using index info to reconstruct a base tree...
M	doc/src/sgml/catalogs.sgml
M	doc/src/sgml/config.sgml
M	doc/src/sgml/func/func-admin.sgml
M	doc/src/sgml/protocol.sgml
M	doc/src/sgml/ref/create_subscription.sgml
M	doc/src/sgml/system-views.sgml
M	src/backend/access/heap/heapam.c
M	src/backend/access/transam/xlog.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/pg_subscription.c
M	src/backend/catalog/system_views.sql
M	src/backend/catalog/toasting.c
M	src/backend/commands/publicationcmds.c
M	src/backend/commands/subscriptioncmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/postmaster/autovacuum.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/walreceiver.c
M	src/backend/replication/walsender.c
M	src/backend/utils/init/postinit.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/guc_tables.c
M	src/bin/pg_dump/pg_dump.c
M	src/bin/pg_dump/pg_dump.h
M	src/bin/pg_dump/t/002_pg_dump.pl
M	src/include/access/xlog.h
M	src/include/catalog/Makefile
M	src/include/catalog/meson.build
M	src/include/catalog/pg_class.h
M	src/include/catalog/pg_proc.dat
M	src/include/utils/guc_hooks.h
M	src/include/utils/rel.h
M	src/test/recovery/meson.build
M	src/test/regress/expected/oidjoins.out
M	src/test/regress/expected/rules.out
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/test/regress/expected/oidjoins.out
Auto-merging src/test/recovery/meson.build
CONFLICT (content): Merge conflict in src/test/recovery/meson.build
Auto-merging src/include/utils/rel.h
Auto-merging src/include/utils/guc_hooks.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/include/catalog/pg_class.h
Auto-merging src/include/catalog/meson.build
Auto-merging src/include/catalog/Makefile
Auto-merging src/include/access/xlog.h
Auto-merging src/bin/pg_dump/t/002_pg_dump.pl
Auto-merging src/bin/pg_dump/pg_dump.h
Auto-merging src/bin/pg_dump/pg_dump.c
Auto-merging src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/utils/init/postinit.c
Auto-merging src/backend/replication/walsender.c
Auto-merging src/backend/replication/walreceiver.c
CONFLICT (content): Merge conflict in src/backend/replication/walreceiver.c
Auto-merging src/backend/replication/logical/tablesync.c
Auto-merging src/backend/replication/logical/reorderbuffer.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/reorderbuffer.c
Auto-merging src/backend/postmaster/autovacuum.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/subscriptioncmds.c
Auto-merging src/backend/commands/publicationcmds.c
Auto-merging src/backend/catalog/toasting.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging src/backend/catalog/pg_subscription.c
Auto-merging src/backend/catalog/heap.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging src/backend/access/heap/heapam.c
Auto-merging doc/src/sgml/system-views.sgml
Auto-merging doc/src/sgml/ref/create_subscription.sgml
Auto-merging doc/src/sgml/protocol.sgml
Auto-merging doc/src/sgml/func/func-admin.sgml
Auto-merging doc/src/sgml/config.sgml
Auto-merging doc/src/sgml/catalogs.sgml
Patch failed at 0001 Support selective logical WAL for restricted replication slots

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"