Infinite loop of "please commit your changes" for package.json & .package-lock.json
I'm working off of a developer branch, 'jordan', right now. I've done everything I have to do there, committed and pushed my changes to that 'jordan' branch, refreshed the GH page in the browser and see my 'jordan' push having occurred.
'main' is a different branch and has changes to it that are not reflected in my 'jordan' branch
I want to continue working in my 'jordan' branch, but I would like to first merge the 'main' branch changes into 'jordan'.
I've tried
I then try to simply checkout to
I haven't made any changes to these files, and have re-added, committed everything multiple times, even getting the message "your branch is up to date with origin/jordan', but as soon as I try to checkout, I get the
What could be causing this, how do I proceed?
'main' is a different branch and has changes to it that are not reflected in my 'jordan' branch
I want to continue working in my 'jordan' branch, but I would like to first merge the 'main' branch changes into 'jordan'.
I've tried
git pull origin main but it tells me that I'm already up to date.I then try to simply checkout to
main, and I'm given a message saying there are changes to my package.jsonpackage-lock.json files I need to commit before I can checkout. I haven't made any changes to these files, and have re-added, committed everything multiple times, even getting the message "your branch is up to date with origin/jordan', but as soon as I try to checkout, I get the
changes not staged for commit: message RE package.json, etc.What could be causing this, how do I proceed?
