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 Jun 11 2017, 4:41 AM - Parents
- rKLEOPATRAe16fcbb795db: Merge remote-tracking branch 'origin/Applications/17.04'
- Branches
- Unknown
- Tags