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.12
l10n daemon script
3 years ago
parent
3b2a1d6d9b
commit
666fb6664d
1 changed files with 1 additions and 0 deletions
Loading…
Reference in new issue