From b94ad729fd8765f2eb4ca8adf48e959110f9437f Mon Sep 17 00:00:00 2001 From: Alexander <6258737+alxndr42@users.noreply.github.com> Date: Thu, 6 Nov 2025 12:08:32 +0100 Subject: [PATCH] Update cmdeploy/src/cmdeploy/__init__.py Co-authored-by: missytake --- cmdeploy/src/cmdeploy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index c1f407d6..50977905 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -824,7 +824,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None: if not www_path.is_dir(): logger.warning("Building web pages is disabled in chatmail.ini, skipping") elif (path := find_merge_conflict(src_dir)) is not None: - logger.warning(f"Merge conflict found in {path}, skipping") + logger.warning(f"Merge conflict found in {path}, skipping website deployment. Fix merge conflict if you want to upload your web page.") else: # if www_folder is a hugo page, build it if build_dir: