=== Applying patches on top of PostgreSQL commit ID 556c92a68972818b24d31d060175ae8131d3297b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jan 14 17:44:22 UTC 2026
On branch cf/6247
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Reorganize-pqcomm.h-a-bit.patch ===
Applying: Reorganize pqcomm.h a bit
Using index info to reconstruct a base tree...
M	src/include/libpq/pqcomm.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/libpq/pqcomm.h
CONFLICT (content): Merge conflict in src/include/libpq/pqcomm.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 Reorganize pqcomm.h a bit
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/libpq/pqcomm.h
=== using patch(1) to apply patch ./v2-0001-Reorganize-pqcomm.h-a-bit.patch ===
patching file src/include/libpq/pqcomm.h
Hunk #1 FAILED at 40.
Hunk #2 succeeded at 69 with fuzz 2.
Hunk #3 FAILED at 84.
Hunk #4 FAILED at 93.
Hunk #5 FAILED at 107.
Hunk #6 FAILED at 119.
Hunk #7 FAILED at 146.
Hunk #8 FAILED at 166.
7 out of 8 hunks FAILED -- saving rejects to file src/include/libpq/pqcomm.h.rej
Unstaged changes after reset:
M	src/include/libpq/pqcomm.h
Removing src/include/libpq/pqcomm.h.rej
=== using 'git apply' to apply patch ./v2-0001-Reorganize-pqcomm.h-a-bit.patch ===
Applied patch to 'src/include/libpq/pqcomm.h' with conflicts.
U src/include/libpq/pqcomm.h
diff --cc src/include/libpq/pqcomm.h
index 6df6e0f902d,625f4b43879..00000000000
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@@ -114,6 -114,7 +114,10 @@@ is_unixsock_path(const char *path
  
  
  typedef uint32 ProtocolVersion; /* FE/BE protocol version number */
++<<<<<<< ours
++=======
+ typedef ProtocolVersion MsgType;
++>>>>>>> theirs
  
  
  /*