I am trying to upgrade to 3.11 from 3.10. I have a script that I use and it returned the following:
error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge.
So .eslintignore and the other files seem to have changes that need to be committed? Not sure why/how as I never edited these files.
Can I simply do a git add * then git commit and then restart the upgrade?