Asynchronous MergeAppend

Applying: Introduce AppendBase/AppendBaseState base types for Append/MergeAppend
Using index info to reconstruct a base tree...
M	contrib/pg_plan_advice/pgpa_scan.c
M	contrib/postgres_fdw/postgres_fdw.c
M	src/backend/commands/explain.c
M	src/backend/executor/nodeAppend.c
M	src/backend/optimizer/plan/createplan.c
M	src/backend/optimizer/plan/setrefs.c
M	src/backend/optimizer/plan/subselect.c
M	src/backend/utils/adt/ruleutils.c
M	src/include/nodes/execnodes.h
M	src/include/nodes/plannodes.h
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/include/nodes/plannodes.h
Auto-merging src/include/nodes/execnodes.h
Auto-merging src/backend/utils/adt/ruleutils.c
Auto-merging src/backend/optimizer/plan/subselect.c
Auto-merging src/backend/optimizer/plan/setrefs.c
Auto-merging src/backend/optimizer/plan/createplan.c
Auto-merging src/backend/executor/nodeAppend.c
CONFLICT (content): Merge conflict in src/backend/executor/nodeAppend.c
Auto-merging src/backend/commands/explain.c
Auto-merging contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/pg_plan_advice/pgpa_scan.c
Patch failed at 0001 Introduce AppendBase/AppendBaseState base types for Append/MergeAppend

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"