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 Jan 20 2020, 9:51 AM - Parents
- rLIBKLEO2fc5e5b73b7d: GIT_SILENT: Prepare 5.13.2
- Branches
- Unknown
- Tags
- References
- tag: v19.12.2