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"remotes/origin/release/22.08
parent
8a391c42c3
commit
209e4aa034
34 changed files with 67 additions and 67 deletions
Loading…
Reference in new issue