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

2024-11-28 03:04:07 +00:00

3.2 KiB

Raw Blame History

View Raw