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
- Provenance
l10n daemon script <scripty@kde.org> Authored on Jul 2 2022, 5:18 AM - Parents
- rKLEOPATRAed2a73665c97: GIT_SILENT Update Appstream for new release
- Branches
- Unknown
- Tags
- References
- tag: v22.04.3, release/22.04