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 Dec 20 2016, 1:19 PM - Parents
- rKLEOPATRA377b05bacec6: Merge branch 'Applications/16.12'
- Branches
- Unknown
- Tags