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
16128c818b
commit
4ecd5c7f24
2 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue