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 Jul 22 2020, 10:48 AM
Parents
rKLEOPATRAb79f62db62ea: GIT_SILENT: prepare 5.15rc
Branches
Unknown
Tags
Unknown
References
tag: v20.07.90

Event Timeline

l10n daemon script <scripty@kde.org> committed rKLEOPATRA6f2a8f0b3f8d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 22 2020, 10:48 AM