On Jun 12, 2023, at 05:04, Ashhar Farhan <farhanbox@...> wrote:

?

I need help, my knowledge of how git commands work is very poor, though I understand how it works very well (story of my life!).

This is the problem:

The hw_settings.ini was earlier checked into the git repo, but users run their own calibration settings and a new hw_settings.ini gets written. However, when we do an update, the hw_settings.ini from the git repo tried to overwrite the custom generated hw_settings.ini.?

To overcome this, I removed the hw_settings.ini from the git repo with a git rm command, made a commit and pushed the changes to the github.

However, now, as many users are reporting, on update, the hw_settings.ini is being flagged as "changed" and prompting the user to stash it. It essentially is trying to say that hw_settings.ini shouldn't be there.

Is there some magic we can do with .gitignore that will make future git pulls and pushes ignore hw_settings.ini and let it exist in the data folder?

- farhan?