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 2016-11-25 04:59:58 +01:00

parent 297f65a720

commit 711e7b4a94

5 changed files with 5 additions and 5 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