l10n daemon script 04020e7021 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"

2020-11-12 06:24:28 +01:00

2.0 KiB

Raw Blame History

View Raw