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
0db61995a6
commit
73b2d30b10
1 changed files with 1 additions and 0 deletions
Loading…
Reference in new issue