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 10 2020, 3:27 AM - Parents
- R319:946edf7e4861: GIT_SILENT Update Appstream for new release
- Branches
- Unknown
- Tags
- References
- refs/keep-around/95535c3becc9c25f95c0262e45fbb41c2b710e73