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/2004_421508
parent
b82682037e
commit
5dfbee0a00
1 changed files with 0 additions and 1 deletions
Loading…
Reference in new issue