partitioning code reorganization

Applying: Make copying of cached partitioning info more consistent
Using index info to reconstruct a base tree...
M	src/backend/catalog/heap.c
M	src/backend/catalog/partition.c
M	src/backend/catalog/pg_constraint.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/executor/execPartition.c
M	src/backend/optimizer/prep/prepunion.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/parser/parse_utilcmd.c
M	src/backend/partitioning/partbounds.c
M	src/backend/partitioning/partprune.c
M	src/backend/utils/cache/partcache.c
M	src/backend/utils/cache/relcache.c
M	src/include/catalog/partition.h
M	src/include/executor/execPartition.h
M	src/include/partitioning/partbounds.h
M	src/include/partitioning/partprune.h
M	src/include/utils/partcache.h
M	src/include/utils/rel.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/rel.h
Auto-merging src/include/utils/partcache.h
CONFLICT (content): Merge conflict in src/include/utils/partcache.h
Auto-merging src/include/partitioning/partprune.h
CONFLICT (content): Merge conflict in src/include/partitioning/partprune.h
Auto-merging src/include/partitioning/partbounds.h
CONFLICT (content): Merge conflict in src/include/partitioning/partbounds.h
Auto-merging src/include/executor/execPartition.h
CONFLICT (content): Merge conflict in src/include/executor/execPartition.h
Auto-merging src/include/catalog/partition.h
CONFLICT (content): Merge conflict in src/include/catalog/partition.h
Auto-merging src/backend/utils/cache/relcache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/relcache.c
Auto-merging src/backend/utils/cache/partcache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/partcache.c
Auto-merging src/backend/partitioning/partprune.c
CONFLICT (content): Merge conflict in src/backend/partitioning/partprune.c
Auto-merging src/backend/partitioning/partbounds.c
CONFLICT (content): Merge conflict in src/backend/partitioning/partbounds.c
Auto-merging src/backend/parser/parse_utilcmd.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_utilcmd.c
Auto-merging src/backend/optimizer/util/plancat.c
CONFLICT (content): Merge conflict in src/backend/optimizer/util/plancat.c
Auto-merging src/backend/optimizer/prep/prepunion.c
CONFLICT (content): Merge conflict in src/backend/optimizer/prep/prepunion.c
Auto-merging src/backend/executor/execPartition.c
CONFLICT (content): Merge conflict in src/backend/executor/execPartition.c
Auto-merging src/backend/commands/trigger.c
CONFLICT (content): Merge conflict in src/backend/commands/trigger.c
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/indexcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/indexcmds.c
Auto-merging src/backend/catalog/pg_constraint.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_constraint.c
Auto-merging src/backend/catalog/partition.c
Auto-merging src/backend/catalog/heap.c
CONFLICT (content): Merge conflict in src/backend/catalog/heap.c
Patch failed at 0001 Make copying of cached partitioning info more consistent

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"