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> Jun 5 2016, 9:41 AM - Parents
- R120:0d0c4f4a2247: Merge branch 'Plasma/5.6'
- Branches
- Unknown
- Tags