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-5.22
parent
26c664506c
commit
0a0e26d316
2 changed files with 4 additions and 0 deletions
Loading…
Reference in new issue