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/work/schwarzer/update_platform_name
parent
7876ccac65
commit
5447aa1021
16 changed files with 31 additions and 0 deletions
Loading…
Reference in new issue