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/Plasma/6.2
parent
d8e8f952a2
commit
6004ffe228
1 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue