l10n daemon script c5a3fc0431 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-05-25 02:21:15 +00:00

3.6 KiB

Raw Blame History

View Raw