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 Sun, Feb 8, 2:37 AM - Parents
- rLIBKLEO927b58adf4b9: SVN_SILENT made messages (.desktop file) - always resolve ours
- Branches
- Unknown
- Tags
- References
- HEAD -> master