l10n daemon script 9496127e88 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-12-12 01:44:42 +00:00

6.1 KiB

Raw Blame History

View Raw