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
parent
28560c5d1c
commit
5f410eee07
1 changed files with 2 additions and 2 deletions
Loading…
Reference in new issue