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/numberformattest
parent
66e3401f54
commit
7589278d35
17 changed files with 17 additions and 17 deletions
Loading…
Reference in new issue