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 1 2020, 3:55 AM - Parents
- R319:d1443053bf9f: Take in consideration the Word Characters of the profile
- Branches
- Unknown
- Tags
- References
- refs/keep-around/6230cddea7359205c8bd5ff9517204669660ae60