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-pre-rebase
parent
17de56d096
commit
91cf2cc9df
6 changed files with 24 additions and 16 deletions
Loading…
Reference in new issue