l10n daemon script 9f51b1e7ab 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-09 02:04:03 +00:00

5.1 KiB

Raw Blame History

View Raw