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
- Committed
l10n daemon script <scripty@kde.org> Apr 13 2018, 3:23 AM - Parents
- R347:20a69bfa9aad: fixed initial creation of l10n dir
- Branches
- Unknown
- Tags
- Reverted By
- R347:61976cf938d4: Revert "SVN_SILENT made messages (.desktop file) - always resolve ours"