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

2021-04-04 01:17:30 +00:00

2.5 KiB

Raw Blame History

View Raw