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-pre-rebase
parent
b67bb573b2
commit
aa9a4732b5
2 changed files with 6 additions and 0 deletions
Loading…
Reference in new issue