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/thinkspoon/wilder
parent
fb19df1aa2
commit
fbf7f956ff
2 changed files with 3 additions and 3 deletions
Loading…
Reference in new issue