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> Sep 22 2017, 2:58 AM - Parents
- R326:d27da865b57f: Merge remote-tracking branch 'origin/Applications/17.08'
- Branches
- Unknown
- Tags
- References
- tag: v17.12.1, tag: v17.12.0, tag: v17.11.90, tag: v17.11.80