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/26/head^2
parent
bbb155c6bb
commit
55caf75ab4
Loading…
Reference in New Issue