l10n daemon script cd17339847 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-02-19 10:38:09 +01:00

3.8 KiB

Raw Blame History

View Raw