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

2022-12-26 02:03:49 +00:00

3.9 KiB

Raw Blame History

View Raw