=== Applying patches on top of PostgreSQL commit ID 0951942bba25f85ad29a4f096ed51a356652b5a2 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Sep 17 11:21:19 UTC 2025
On branch cf/6034
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Fix-comments-in-xlog.h.patch ===
Applying: Fix comments in xlog.h
Using index info to reconstruct a base tree...
M	src/include/access/hash_xlog.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/hash_xlog.h
CONFLICT (content): Merge conflict in src/include/access/hash_xlog.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 Fix comments in xlog.h
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/hash_xlog.h
=== using patch(1) to apply patch ./v2-0001-Fix-comments-in-xlog.h.patch ===
patching file src/include/access/hash_xlog.h
Hunk #1 FAILED at 149.
1 out of 1 hunk FAILED -- saving rejects to file src/include/access/hash_xlog.h.rej
Removing src/include/access/hash_xlog.h.rej
=== using 'git apply' to apply patch ./v2-0001-Fix-comments-in-xlog.h.patch ===
Applied patch to 'src/include/access/hash_xlog.h' with conflicts.
U src/include/access/hash_xlog.h
diff --cc src/include/access/hash_xlog.h
index 5d4671dc4c1,6816b80b07d..00000000000
--- a/src/include/access/hash_xlog.h
+++ b/src/include/access/hash_xlog.h
@@@ -149,7 -149,7 +149,11 @@@ typedef struct xl_hash_move_page_conten
   *
   * This data record is used for XLOG_HASH_SQUEEZE_PAGE
   *
++<<<<<<< ours
 + * Backup Blk 0: primary bucket page
++=======
+  * Backup Blk 0: bucket page
++>>>>>>> theirs
   * Backup Blk 1: page containing tuples moved from freed overflow page
   * Backup Blk 2: freed overflow page
   * Backup Blk 3: page previous to the freed overflow page