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> Mar 11 2020, 8:57 AM - Parents
- R37:d8e2e6d207b6: Use Qt::Popup only on MacOS, Qt::Tool on other systems
- Branches
- Unknown
- Tags
- References
- refs/keep-around/d2f8abb0daff60c8ac858a85cd0ff7547b72faeb