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 Nov 14 2019, 9:24 AM - Parents
- rKLEOPATRA1d45a8c1928c: GIT_SILENT: Prepare 5.13.0beta1
- Branches
- Unknown
- Tags
- References
- tag: v19.11.80, tag: refs/backups/tag-v20.03.80-1584747909