l10n daemon script 169ce33d4b 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-12-20 01:37:16 +00:00

5.9 KiB

Raw Permalink Blame History

View Raw