=== Applying patches on top of PostgreSQL commit ID 952bab8b74d40fcfd25e1949865c3907e676504e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Nov 10 20:34:35 UTC 2026
On branch cf/7608
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Add-pg_stat_progress-overview-view.patch ===
Applying: Add a `pg_stat_progress` overview view
Using index info to reconstruct a base tree...
M	src/include/catalog/catversion.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.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 Add a `pg_stat_progress` overview view
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".
=== using patch(1) to apply patch ./v1-0001-Add-pg_stat_progress-overview-view.patch ===
patching file doc/src/sgml/monitoring.sgml
patching file src/backend/catalog/system_views.sql
patching file src/include/catalog/catversion.h
Hunk #1 FAILED at 57.
1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/catversion.h.rej
patching file src/test/modules/test_misc/meson.build
patching file src/test/modules/test_misc/t/016_stat_progress.pl
patching file src/test/regress/expected/rules.out
Unstaged changes after reset:
M	doc/src/sgml/monitoring.sgml
M	src/backend/catalog/system_views.sql
M	src/test/modules/test_misc/meson.build
M	src/test/regress/expected/rules.out
Removing src/include/catalog/catversion.h.rej
Removing src/test/modules/test_misc/t/016_stat_progress.pl
=== using 'git apply' to apply patch ./v1-0001-Add-pg_stat_progress-overview-view.patch ===
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/include/catalog/catversion.h' with conflicts.
Applied patch to 'src/test/modules/test_misc/meson.build' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
U src/include/catalog/catversion.h
diff --cc src/include/catalog/catversion.h
index 50cf7e94f17,adef5e810a1..00000000000
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@@ -57,6 -57,6 +57,10 @@@
   */
  
  /*							yyyymmddN */
++<<<<<<< ours
 +#define CATALOG_VERSION_NO	202611031
++=======
+ #define CATALOG_VERSION_NO	202611071
++>>>>>>> theirs
  
  #endif