l10n daemon script 9961483f5c 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-16 01:23:20 +00:00

4.7 KiB

Raw Blame History

View Raw