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> Jun 20 2018, 3:47 AM - Parents
- R407:cbabf5ba6bb7: GIT_SILENT made messages (after extraction)
- Branches
- Unknown
- Tags
- References
- tag: v18.08.1, tag: v18.08.0, tag: v18.07.90, tag: v18.07.80