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

2022-10-27 01:49:19 +00:00

3.8 KiB

Raw Blame History

View Raw