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" |
2 years ago | |
---|---|---|
.. | ||
package | 2 years ago | |
plugin | 4 years ago | |
CMakeLists.txt | 3 years ago | |
Messages.sh | 8 years ago |