Skip to content

Conversation

@alxndr42
Copy link

I'm guessing that web browsers are flexible enough, but my text editor noticed. 😅

@missytake
Copy link
Contributor

Yeaah, we get a PR for this every once in a while... problem is, this will cause merge conflicts for many people, and that is not really worth fixing a cosmetic problem - say sorry to your IDE ;)

Theoretically, since a while you can set www_folder=disabled in chatmail.ini. We could start detecting if <<<<<<<<<, ==========, and >>>>>>>>>> are in the www/src/*.md files, and recommend to resolve the merge conflicts or set www_folder=disabled to skip www upload. This would be in any case a good change, as merge conflicts can also happen for other reasons, and e.g. https://mehl.cloud/info.html has a conflict deployed as we speak. Can you maybe add that to this PR? I understand if that's out of your scope 😅

@alxndr42
Copy link
Author

We could start detecting if <<<<<<<<<, ==========, and >>>>>>>>>> are in the www/src/*.md files, and recommend to resolve the merge conflicts or set www_folder=disabled to skip www upload.

Would this be done as part of the pyinfra deployment? I can try to look into that.

(Personally, I'm already using a separate location for www_folder, I just wanted to fix the quotes for anyone else who runs into this. Preferring to avoid a ton of merge conflicts is understandable, though.)

@alxndr42
Copy link
Author

alxndr42 commented Nov 2, 2025

It might be a bit confusing to repurpose this PR for merge conflict detection, so I created a separate issue for it: #713

@alxndr42 alxndr42 closed this Nov 2, 2025
@alxndr42 alxndr42 deleted the patch-1 branch November 2, 2025 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants