CAST(... ON DEFAULT) - WIP build on top of Error-Safe User Functions

Applying: CAST(expr AS newtype DEFAULT expr ON CONVERSION ERROR)
Using index info to reconstruct a base tree...
M	src/backend/executor/execExpr.c
M	src/backend/executor/execExprInterp.c
M	src/backend/jit/llvm/llvmjit_expr.c
M	src/backend/nodes/nodeFuncs.c
M	src/backend/optimizer/util/clauses.c
M	src/backend/parser/gram.y
M	src/backend/parser/parse_agg.c
M	src/backend/parser/parse_coerce.c
M	src/backend/parser/parse_expr.c
M	src/backend/parser/parse_func.c
M	src/backend/parser/parse_target.c
M	src/backend/parser/parse_type.c
M	src/backend/parser/parse_utilcmd.c
M	src/backend/utils/adt/arrayfuncs.c
M	src/backend/utils/adt/ruleutils.c
M	src/include/executor/executor.h
M	src/include/nodes/execnodes.h
M	src/include/nodes/parsenodes.h
M	src/include/nodes/primnodes.h
M	src/include/parser/parse_node.h
M	src/include/parser/parse_type.h
M	src/test/regress/expected/xml.out
M	src/test/regress/parallel_schedule
M	src/test/regress/sql/xml.sql
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/sql/xml.sql
Auto-merging src/test/regress/parallel_schedule
Auto-merging src/test/regress/expected/xml.out
Auto-merging src/include/parser/parse_type.h
CONFLICT (content): Merge conflict in src/include/parser/parse_type.h
Auto-merging src/include/parser/parse_node.h
CONFLICT (content): Merge conflict in src/include/parser/parse_node.h
Auto-merging src/include/nodes/primnodes.h
Auto-merging src/include/nodes/parsenodes.h
Auto-merging src/include/nodes/execnodes.h
Auto-merging src/include/executor/executor.h
Auto-merging src/backend/utils/adt/ruleutils.c
Auto-merging src/backend/utils/adt/arrayfuncs.c
Auto-merging src/backend/parser/parse_utilcmd.c
Auto-merging src/backend/parser/parse_type.c
Auto-merging src/backend/parser/parse_target.c
Auto-merging src/backend/parser/parse_func.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_func.c
Auto-merging src/backend/parser/parse_expr.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_expr.c
Auto-merging src/backend/parser/parse_coerce.c
Auto-merging src/backend/parser/parse_agg.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_agg.c
Auto-merging src/backend/parser/gram.y
Auto-merging src/backend/optimizer/util/clauses.c
CONFLICT (content): Merge conflict in src/backend/optimizer/util/clauses.c
Auto-merging src/backend/nodes/nodeFuncs.c
Auto-merging src/backend/jit/llvm/llvmjit_expr.c
Auto-merging src/backend/executor/execExprInterp.c
Auto-merging src/backend/executor/execExpr.c
Patch failed at 0001 CAST(expr AS newtype DEFAULT expr ON CONVERSION ERROR)

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"