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"$935.js
↧
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"$935.js