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> Dec 20 2016, 12:34 PM - Parents
- R128:bd7c9c76e411: Merge Plasma/5.8 and undo the hiding of an option that is now re-supported
- Branches
- Unknown
- Tags