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 Aug 10 2015, 12:13 PM - Parents
- rKLEOPATRAe8ddaeaeabfc: Fix -Wbitwise-op-parentheses warning
- Branches
- Unknown
- Tags