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> Aug 9 2018, 3:39 AM - Differential Revision
- D14602: Fix no tea is ready notification after second run
- Parents
- R360:5dd5301b9052: Fix no tea is ready notification after second run
- Branches
- Unknown
- Tags