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> Nov 11 2019, 8:48 AM - Parents
- R155:be35e9e7584a: GIT_SILENT Upgrade KDE Applications version to 19.11.80.
- Branches
- Unknown
- Tags
- References
- tag: v19.11.80, tag: refs/backups/tag-v20.03.80-1584747776