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 30 2017, 3:06 AM - Parents
- R32:6c3671d6504e: Use "tool view" over "toolview" in UI/comments, CamelCase term in code
- Branches
- Unknown
- Tags