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" |
6 years ago | |
---|---|---|
.. | ||
contents/code | 7 years ago | |
metadata.desktop | 6 years ago |
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" |
6 years ago | |
---|---|---|
.. | ||
contents/code | 7 years ago | |
metadata.desktop | 6 years ago |