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/23.04
parent
914146924e
commit
3515b5e031
2 changed files with 4 additions and 4 deletions
Loading…
Reference in new issue