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"pull/15/head
parent
0d0b0413bb
commit
d0bf13aa72
Loading…
Reference in New Issue