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, Nov 10, 4:17 AM - Parents
- rKLEOPATRA3ba52e9f0c34: GIT_SILENT: Prepare beta
- Branches
- Unknown
- Tags