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> Jul 5 2019, 3:11 AM - Parents
- R37:c01d3caad5c4: GIT_SILENT made messages (after extraction)
- Branches
- Unknown
- Tags
- References
- refs/keep-around/9a4294b948c5019fc58f38b63d1113ad6f052b3d