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.17
parent
d9b3eff0d0
commit
daa12ee4c3
2 changed files with 4 additions and 0 deletions
Loading…
Reference in new issue