=== Applying patches on top of PostgreSQL commit ID 88824e68611a88a4ef7218c093810a94f86e12e0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Sep 13 08:47:28 UTC 2025
On branch cf/6015
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Improve-pgbench-definition-of-yyscan_t.patch ===
Applying: Improve pgbench definition of yyscan_t
Using index info to reconstruct a base tree...
M	src/bin/pgbench/pgbench.h
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pgbench/pgbench.h
CONFLICT (content): Merge conflict in src/bin/pgbench/pgbench.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improve pgbench definition of yyscan_t
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	src/bin/pgbench/pgbench.h
=== using patch(1) to apply patch ./v2-0001-Improve-pgbench-definition-of-yyscan_t.patch ===
patching file src/bin/pgbench/pgbench.h
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/pgbench/pgbench.h.rej
Removing src/bin/pgbench/pgbench.h.rej
=== using 'git apply' to apply patch ./v2-0001-Improve-pgbench-definition-of-yyscan_t.patch ===
Applied patch to 'src/bin/pgbench/pgbench.h' with conflicts.
U src/bin/pgbench/pgbench.h
diff --cc src/bin/pgbench/pgbench.h
index d55d30e0ef9,f8b7b497d1e..00000000000
--- a/src/bin/pgbench/pgbench.h
+++ b/src/bin/pgbench/pgbench.h
@@@ -20,7 -20,10 +20,14 @@@
   * here looking like the definitions in exprscan.l.  exprparse.y and
   * pgbench.c also use this to be able to declare things as "yyscan_t".
   */
++<<<<<<< ours
 +typedef void *yyscan_t;
++=======
+ #ifndef YY_TYPEDEF_YY_SCANNER_T
+ #define YY_TYPEDEF_YY_SCANNER_T
+ typedef void *yyscan_t;
+ #endif
++>>>>>>> theirs
  
  /*
   * Likewise, we can't see exprparse.y's definition of union YYSTYPE here,