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.26
parent
12dc4e6a74
commit
21f917d128
2 changed files with 4 additions and 0 deletions
Loading…
Reference in new issue