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> Apr 23 2017, 2:04 AM - Parents
- R347:905b39d0dd7c: export_k3b: off-by-one error, wrong titles
- Branches
- Unknown
- Tags