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> Jul 16 2018, 3:20 AM - Parents
- R34:c4850695c31d: avoid runtime error about unknown signal when compiled without WebKit
- Branches
- Unknown
- Tags
- References
- tag: v18.07.80