l10n daemon script d9218b203d 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-17 06:15:36 +01:00

1.6 KiB

Raw Blame History

View Raw