l10n daemon script 5c5b805d3c 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-11-22 01:29:40 +00:00

5.6 KiB

Raw Blame History

View Raw