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 Jan 31 2024, 4:06 AM
Parents
rKLEOPATRA53a0c2098d87: Use release branches for the Flatpak
Branches
Unknown
Tags
Unknown

Event Timeline

l10n daemon script <scripty@kde.org> committed rKLEOPATRA7f5eebe0701d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 31 2024, 4:06 AM