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> Jun 6 2020, 6:49 AM - Parents
- R37:79ff7fac767c: Add notification that move-selection stroke ended unexpectedly
- Branches
- Unknown
- Tags
- References
- refs/keep-around/5f59b6756eb3421f346f2db69a8e5dc233066ea1