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-portage-prov
parent
0b44a16ef4
commit
5575f2e784
1 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue