I didn't change anything in the the local clone.
With cleaning as you suggested:
dolphin-emu tob$ git reset --hard origin/master
HEAD is now at 0811311 TextureCacheBase: Delete textures completely instead of just invalidating them in ClearRenderTargets.
dolphin-emu tob$ git revert 1dd6b978c1da
error: could not revert 1dd6b97... Remove "Disable Lighting".
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
I have no idea why it ain't working
And again, thanks for your patience!
With cleaning as you suggested:
dolphin-emu tob$ git reset --hard origin/master
HEAD is now at 0811311 TextureCacheBase: Delete textures completely instead of just invalidating them in ClearRenderTargets.
dolphin-emu tob$ git revert 1dd6b978c1da
error: could not revert 1dd6b97... Remove "Disable Lighting".
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
I have no idea why it ain't working

And again, thanks for your patience!
Desktop HTPC:
Gigabyte Z97X-Gaming5- i7-4790k MSI-B75-E33, i5-2500k
Corsair Vengeance 16GB RAM Crucial 8GB RAM
Gigabyte GTX780 GHz Edt. ASUS GTX960 Strix
Win 10 Pro / OS X 10.10 Win 10 Pro
Gigabyte Z97X-Gaming5- i7-4790k MSI-B75-E33, i5-2500k
Corsair Vengeance 16GB RAM Crucial 8GB RAM
Gigabyte GTX780 GHz Edt. ASUS GTX960 Strix
Win 10 Pro / OS X 10.10 Win 10 Pro
