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> Oct 31 2019, 4:20 AM - Parents
- R37:0d6bd4e9c2d5: Rewrite "Auto Precision" option
- Branches
- Unknown
- Tags
- References
- refs/keep-around/b103d0c70e3ec9937248ce32589bdf9284b14d18