l10n daemon script b7c9ec9bd2 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"

2025-02-13 03:19:25 +00:00

13 KiB

Raw Blame History

View Raw