l10n daemon script f5837a208a 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-03-05 02:49:38 +00:00

4.5 KiB

Raw Permalink Blame History

View Raw