Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:16:02 12.03.2026.

diff --git a/bin/check_repo.sh b/bin/check_repo.sh
index 088e137b97d5b9419d4600eb3cbe591651298439..1ecb927dc709d3cad0ee712618e8f446c7f73734 100755 (executable)
--- a/bin/check_repo.sh
+++ b/bin/check_repo.sh
@@ -8,6 +8,9 @@ lsfiles="$(git ls-files --others --exclude-standard || true)"
 # Conflict or unresolved state: stop and notify.
 if [[ -n "$dirty" ]]; then
     echo "[check_repo] repo has conflicts, stop"
+    echo "[check_repo] unmerged files:"
+    printf "%s\n" "$dirty"
+    echo "[check_repo] resolve conflicts and run: git add <files> && git commit"
     bash bin/notify_telegram.sh "STOP: repo conflicts in $(pwd)"
     exit 1
 fi

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index a03728e8c19d0c243b0e26ef3cc03a68869ad6e9..c733a6ff5a805f489db48b536b6a302c2070e84c 100644 (file)
--- a/html/AM-GlobalFunc.rsc
+++ b/html/AM-GlobalFunc.rsc
@@ -16,9 +16,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/148/88fb8eb0";
+:global CommitId "main/149/55914108";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:10:57 12.03.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:16:05 12.03.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;