Tepid: selective index updates for heap relations

Applying: Add HOT-indexed updates: selective index maintenance and reads
Using index info to reconstruct a base tree...
M	src/backend/access/heap/heapam.c
M	src/backend/commands/repack.c
M	src/backend/executor/nodeIndexonlyscan.c
M	src/backend/executor/nodeModifyTable.c
M	src/backend/utils/activity/pgstat_relation.c
M	src/backend/utils/cache/relcache.c
M	src/include/nodes/execnodes.h
M	src/include/pgstat.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/pgstat.h
Auto-merging src/include/nodes/execnodes.h
Auto-merging src/backend/utils/cache/relcache.c
Auto-merging src/backend/utils/activity/pgstat_relation.c
Auto-merging src/backend/executor/nodeModifyTable.c
Auto-merging src/backend/executor/nodeIndexonlyscan.c
Auto-merging src/backend/commands/repack.c
Auto-merging src/backend/access/heap/heapam.c
CONFLICT (content): Merge conflict in src/backend/access/heap/heapam.c
Patch failed at 0001 Add HOT-indexed updates: selective index maintenance and reads

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"