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 22 2020, 3:15 AM - Parents
- R37:b499703865a6: No need to abort when this assert fails
- Branches
- Unknown
- Tags
- References
- refs/keep-around/4c7fe5aacb4f56928e26c7b3fa854130fe7b2bb7