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
adbf69aab4
commit
2b684146c7
5 changed files with 10 additions and 0 deletions
Loading…
Reference in new issue