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/bshah/hwcomposer_testing
parent
4d669b1912
commit
2b51b85aa1
4 changed files with 24 additions and 0 deletions
Loading…
Reference in new issue