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> Dec 3 2018, 4:35 AM - Parents
- R94:ce22aff5c9d7: GIT_SILENT: increase cmake to 3.5
- Branches
- Unknown
- Tags