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> Jan 12 2018, 5:32 AM - Parents
- R99:7abd12105db6: Update version number for 5.11.5 GIT_SILENT
- Branches
- Unknown
- Tags
- References
- Plasma/5.11