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"
Description
Description
Details
Details
- Provenance
l10n daemon script <scripty@kde.org> Authored on Sat, Nov 16, 4:13 AM - Parents
- rLIBKLEO541725ca3f5a: Use synchronous QProcess API to start gpg-agent without event loop
- Branches
- Unknown
- Tags