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"wilder-reb-27
parent
a1190c3d8b
commit
ee353ddff0
3 changed files with 6 additions and 0 deletions
Loading…
Reference in new issue