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

Authored by l10n daemon script <scripty@kde.org> on Jul 14 2019, 3:08 AM.

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

Committed
l10n daemon script <scripty@kde.org>Jul 14 2019, 3:08 AM
Parents
R2:00ad763818da: GIT_SILENT made messages (after extraction)
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R2:2d41151b9e50: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 14 2019, 3:08 AM