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"work/fuf/bug464528
parent
f7088bf0ba
commit
6c2b5f4971
Loading…
Reference in New Issue