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
- Provenance
l10n daemon script <scripty@kde.org> Authored on Jul 11 2021, 4:12 AM - Parents
- rLIBKLEO1568a3fac3e0: GIT_SILENT: prepare 5.17.80beta (I didn't know that release 21.08 was created...
- Branches
- Unknown
- Tags
- References
- tag: v21.07.80