l10n daemon script 03ec17366e 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-06-03 02:27:05 +00:00

4.2 KiB

Raw Blame History

View Raw