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> Mar 1 2017, 4:49 AM - Parents
- R32:43c92e0f876e: Merge branch '5.1'
- Branches
- Unknown
- Tags