Home GnuPG

SVN_SILENT made messages (.desktop file) - always resolve ours

Description

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"

Details

Provenance
l10n daemon script <scripty@kde.org>Authored on Nov 9 2022, 4:03 AM
Parents
rKLEOPATRA6db13f6c28c8: GIT_SILENT Sync po/docbooks with svn
Branches
Unknown
Tags
Unknown
References
tag: v22.11.80

Event Timeline

l10n daemon script <scripty@kde.org> committed rKLEOPATRA29c0ddd8b06f: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 9 2022, 4:03 AM