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> Aug 6 2017, 2:41 AM - Parents
- R530:5acc9ae00a7a: Merge remote-tracking branch 'origin/releng3.0'
- Branches
- Unknown
- Tags