=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jan 17 14:43:26 UTC 2026
On branch cf/5326
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v19-0001-Introduces-table-AM-APIs-for-parallel-table-vacu.patch ===
Applying: Introduces table AM APIs for parallel table vacuuming.
Using index info to reconstruct a base tree...
M	src/include/access/tableam.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/tableam.h
CONFLICT (content): Merge conflict in src/include/access/tableam.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 Introduces table AM APIs for parallel table vacuuming.
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/include/access/tableam.h
=== using patch(1) to apply patch ./v19-0001-Introduces-table-AM-APIs-for-parallel-table-vacu.patch ===
patching file src/include/access/tableam.h
Hunk #1 FAILED at 36.
Hunk #2 succeeded at 654 (offset 1 line).
Hunk #3 succeeded at 1762 (offset 12 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/include/access/tableam.h.rej
Unstaged changes after reset:
M	src/include/access/tableam.h
Removing src/include/access/tableam.h.rej
=== using 'git apply' to apply patch ./v19-0001-Introduces-table-AM-APIs-for-parallel-table-vacu.patch ===
Applied patch to 'src/include/access/tableam.h' with conflicts.
U src/include/access/tableam.h
diff --cc src/include/access/tableam.h
index e2ec5289d4d,7ab3c2fe6e7..00000000000
--- a/src/include/access/tableam.h
+++ b/src/include/access/tableam.h
@@@ -34,11 -34,13 +34,21 @@@ extern PGDLLIMPORT char *default_table_
  extern PGDLLIMPORT bool synchronize_seqscans;
  
  
++<<<<<<< ours
 +/* forward references in this file */
 +typedef struct BulkInsertStateData BulkInsertStateData;
 +typedef struct IndexInfo IndexInfo;
 +typedef struct SampleScanState SampleScanState;
 +typedef struct ValidateIndexState ValidateIndexState;
++=======
+ struct BulkInsertStateData;
+ struct IndexInfo;
+ struct ParallelContext;
+ struct ParallelVacuumState;
+ struct ParallelWorkerContext;
+ struct SampleScanState;
+ struct ValidateIndexState;
++>>>>>>> theirs
  
  /*
   * Bitmask values for the flags argument to the scan_begin callback.