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
df66d0cf13
commit
326d314677
35 changed files with 35 additions and 35 deletions
Loading…
Reference in new issue