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/anmolgautam
parent
9dd9e24e10
commit
46bed4a478
1 changed files with 12 additions and 0 deletions
Loading…
Reference in new issue