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> Apr 2 2020, 8:23 AM - Parents
- R340:22896540fc01: GIT_SILENT Upgrade release service version to 20.03.90.
- Branches
- Unknown
- Tags
- References
- tag: v20.03.90