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"
l10n daemon script <scripty@kde.org> | Aug 26 2017, 2:41 AM |