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

2024-12-28 03:21:35 +00:00

3.3 KiB

Raw Blame History

View Raw