Sickchill: Can't find "Git reset" option

[bonny1992]

Hello, every time I try to update SickRage it returns the error

2017-03-20 12:48:11 Thread-24 :: Please enable 'git reset' in settings or stash your changes in local files

Until now I've always resetted the repo manually, but now I'd like to have it automated.
The problem is that I cannot find the option to enable the git reset described here:
Wiki FAQ

What can I do?

SickRage version: master (4 commits behind, to be honest).
OS: Windows 8.1

[SickRage2]

Thanks for the issue report! Before a real human comes by, please make sure your report has all the below criteria checked

• [ ] Include basic information: Branch/Commit, OS, What you did, What happened, What you expected
• [ ] Enable debug logging (be sure to disable after the bug is fixed)
• [ ] Post debug logs, either inline (for smaller logs) or using gist

Please make sure you also read how to create an issue and followed all of the steps.

The title should describe your issue. Having "SR not working" or "I get this bug" for 100 issues, isn't really helpful. We will close issues if there isn't enough information.

Sometimes the devs may seem like grunts and respond with short answers. This isn't (always) because the dev hates you, but because he's on mobile or busy fixing bugs. If something isn't clear, please let us know, and this bot may get updated to automatically answer you.

Thanks!

[sharkykh]

Shutdown sickrage, edit config.ini in your data folder, look for git_reset=0 change 0 to 1, run sickrage

[bonny1992]

It is already set on 1 :\

[sharkykh]

Have you edited some files in the sickrage directory? That's the only reason for this I can think of.

[bonny1992]

Nope, everytime I have to reset the directory using the manual git reset

git reset --hard upstream/master
git pull

Although sometimes it does manage to update by itself (often it fails).

[sharkykh]

if you run git reset --hard master (master, not upstream/master)
what does it return?

[bonny1992]

Just ran it:
HEAD is now at 7814387 Fixes #3420 (#3429)

[sharkykh]

That's great.
git pull

after that git status let's see what might cause issues

[bonny1992]

git pull returns

Updating 7814387..a0317f3
error: Your local changes to the following files would be overwritten by merge:
        sickbeard/providers/immortalseed.py
Please commit your changes or stash them before you merge.
Aborting

I absolutely did not edit that file.

[sharkykh]

delete the file, run git reset --hard master again
then git pull again

[bonny1992]

Same error :/

[sharkykh]

git reset --hard a0317f387e1df4fff138ca9f06abb6f40d7921d7
I don't think it'll work but try

[bonny1992]

Resetting to that particular commit and then pulling said
Already up to date

[sharkykh]

okay, so that's supposed to be fixed right now

[sharkykh]

if you run into the same issue again, this looks like a faster solution

[bonny1992]

Let's hope it won't happen again!
In the meanwhile, thank you @sharkykh!