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 5 2017, 8:00 AM - Parents
- R34:3f43132ff020: SVN_SILENT made messages (.desktop file) - always resolve ours
- Branches
- Unknown
- Tags
- References
- tag: v16.12.3