l10n daemon script 49e1bf9ab1 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-26 03:05:24 +00:00

3.1 KiB

Raw Blame History

View Raw