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> Jun 10 2017, 3:41 AM - Parents
- R108:6d9a7142e5b7: Update version number for 5.10.1 GIT_SILENT
- Branches
- Unknown
- Tags