[PATCH] kNN for btree

Applying: Introduce IndexAmRoutine.ammorderbyopfirstcol
Using index info to reconstruct a base tree...
M	contrib/bloom/blutils.c
M	doc/src/sgml/indexam.sgml
M	src/backend/access/brin/brin.c
M	src/backend/access/gin/ginutil.c
M	src/backend/access/gist/gist.c
M	src/backend/access/hash/hash.c
M	src/backend/access/nbtree/nbtree.c
M	src/backend/access/spgist/spgutils.c
M	src/backend/optimizer/path/indxpath.c
M	src/include/access/amapi.h
M	src/include/nodes/pathnodes.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/nodes/pathnodes.h
Auto-merging src/include/access/amapi.h
CONFLICT (content): Merge conflict in src/include/access/amapi.h
Auto-merging src/backend/optimizer/path/indxpath.c
Auto-merging src/backend/access/spgist/spgutils.c
CONFLICT (content): Merge conflict in src/backend/access/spgist/spgutils.c
Auto-merging src/backend/access/nbtree/nbtree.c
CONFLICT (content): Merge conflict in src/backend/access/nbtree/nbtree.c
Auto-merging src/backend/access/hash/hash.c
CONFLICT (content): Merge conflict in src/backend/access/hash/hash.c
Auto-merging src/backend/access/gist/gist.c
CONFLICT (content): Merge conflict in src/backend/access/gist/gist.c
Auto-merging src/backend/access/gin/ginutil.c
CONFLICT (content): Merge conflict in src/backend/access/gin/ginutil.c
Auto-merging src/backend/access/brin/brin.c
CONFLICT (content): Merge conflict in src/backend/access/brin/brin.c
Auto-merging doc/src/sgml/indexam.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/indexam.sgml
Auto-merging contrib/bloom/blutils.c
CONFLICT (content): Merge conflict in contrib/bloom/blutils.c
Patch failed at 0001 Introduce IndexAmRoutine.ammorderbyopfirstcol

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"