SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source

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"

...

This commit is contained in:

l10n daemon script 2021-12-24 01:42:40 +00:00

parent 81a60255f6

commit 851ba48346

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files