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
- Group Auditors
Restricted Owners Package - Committed
l10n daemon script <scripty@kde.org> Feb 26 2017, 7:24 AM - Parents
- R487:82cd3c008140: Merge branch 'Plasma/5.7'
- Branches
- Unknown
- Tags