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 May 28 2022, 5:57 AM
Parents
rLIBKLEO9afeaa9f148b: GIT_SILENT: prepare 22.04.2
Branches
Unknown
Tags
Unknown
References
tag: v22.04.2

Event Timeline

l10n daemon script <scripty@kde.org> committed rLIBKLEOb401d87b88c1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 28 2022, 5:57 AM