SebastJava
commented
3 years ago There are conflicts. Merge and edits are done on my local repo instead. I did this:
git fetch origin; git checkout colors-up; git merge master
There were 4 conflicting files, so i did this:
git rm -r src/Mint-X
git checkout --ours README.md
git checkout --ours .gitignore
git add .gitignore
git add README.md
git status
git commit
Updates from linuxmint/mint-themes source.