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> Jul 22 2019, 3:09 AM - Parents
- R370:3fc8e1f8f9f5: GIT_SILENT Upgrade KDE Applications version to 19.11.70.
- Branches
- Unknown
- Tags