Update cmdeploy/src/cmdeploy/__init__.py

Co-authored-by: missytake <missytake@systemli.org>
This commit is contained in:
Alexander
2025-11-06 12:08:32 +01:00
committed by missytake
parent b60267f37f
commit b94ad729fd

View File

@@ -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: