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> Jan 17 2018, 5:45 AM - Parents
- R119:5551d9be17dd: [Folder View] Don't trash local files
- Branches
- Unknown
- Tags