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 24 2019, 4:43 AM - Parents
- R1034:9ff33b7fa6ca: Merge branch 'set_taw' into 'master'
- Branches
- Unknown
- Tags