l10n daemon script 80f81847f4 SVN_SILENT made messages (.desktop file) - always resolve ours ...

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

2025-09-08 04:03:30 +00:00

3.8 KiB

Raw Blame History

View Raw