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
- Committed
l10n daemon script <scripty@kde.org> Jul 14 2019, 3:19 AM - Parents
- R206:d4175e5a8f0e: GIT_SILENT: Prepare 5.11.80 (19.08.0 beta)
- Branches
- Unknown
- Tags