l10n daemon script a76d4496da 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-04-08 03:15:18 +00:00

3.9 KiB

Raw Blame History

View Raw