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"remotes/origin/work/kwallt-no-wildcard
parent
9eaffd1208
commit
e0ea9fd04c
9 changed files with 12 additions and 0 deletions
Loading…
Reference in new issue