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 9 2020, 4:45 AM - Parents
- R37:b26525b369bf: "Work around" a bug in Qt 5.14 where Krita crashes on exit
- Branches
- Unknown
- Tags
- References
- refs/keep-around/b1637fee3ac88661cb9c973162fb57fb2d3e13af