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> Jan 6 2019, 7:38 AM - Parents
- R55:a7a0191c1f04: Fix logic bug in insertEntryBefore: add missing else branch, corresponding to…
- Branches
- Unknown
- Tags
- References
- tag: v18.12.1