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 18 2019, 5:23 AM - Parents
- rLIBKLEO4f9f9cb7b22d: Merge remote-tracking branch 'origin/release/19.12'
- Branches
- Unknown
- Tags