"Your local changes to the following files would be overwritten by checkout"

[n-ham]

I keep getting the following when trying to use brew bump-formula-pr

/usr/local/Homebrew/Library/Homebrew/utils/gems.rb:69: warning: Insecure world writable dir /usr/local/Homebrew in PATH, mode 040777
error: Your local changes to the following files would be overwritten by checkout:
	Formula/nift.rb
Please commit your changes or stash them before you switch branches.
Aborting
Error: Failure while executing; `git checkout --no-track -b bump-nift-2.4.2 origin/master` exited with 1.

I have tried deleting the formula file for Nift, and tried replacing it with the current one homebrew-core repo. I am admitting defeat on working out how to fix that and hoping someone reads this who knows what I need to do to rectify the situation. My sincere apologies for any annoyances it has caused with the homebrew-core repo.

[carlocab]

If there aren't any changes to your local Homebrew repos that you're going to miss, you can do

brew update-reset

Please note the following:

❯ brew help update-reset
Usage: brew update-reset [repository ...]

Fetch and reset Homebrew and all tap repositories (or any specified
repository) using git(1) to their latest origin/HEAD.

Note: this will destroy all your uncommitted or committed changes.

If that still didn't cut it:

cd $(brew --repo homebrew/core)
git remote update
git checkout master
git reset --hard origin/master
git clean -xdf

[gromgit]

And before you do all that, run git -C $(brew --repo homebrew/core) diff to see exactlly what's changed locally, to be sure that you don't want to keep them. If you do want to keep the changes, git stash is a good way to get those changes stashed away temporarily.

[n-ham]

Thanks for the quick response, I'm away from the laptop I have osx on (despite having 5 macbooks) until tomorrow but will figure this mess from my end out tomorrow.

[n-ham]

I tried the 'if that still doesn't cut it' approach and got:

Error: Failure while executing; `git checkout --no-track -b bump-nift-2.4.3 origin/master` exited with 128.

Then got the following:

Error: You need to bump this formula manually since the new version
and old version are both 2.4.3.

I think in the past it was worked when that last statement has appeared, but probably due to people's manual work which I expect would be quite annoying..

[n-ham]

I have hopefully sorted it out now.. Though it seems to also be complaining about me not using a personal access token? I prefer to still have the layer of GitHub password on top of the security from my computer password..

[carlocab]

Yea, you need a GitHub token. You can create one at https://github.com/settings/tokens.

If you want to treat it like a password, you can do

HOMEBREW_GITHUB_API_TOKEN=<your token> brew bump-formula-pr <args>

I don't recommend this if you're on a multi-user system. Note that this will also save your token in your shell history.

[gromgit]

I prefer to still have the layer of GitHub password on top of the security from my computer password..

Come mid-August, you'll have to switch to token usage anyway, so you might as well get used to it now: https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/

[n-ham]

Despite trying to be extra careful I think I managed to fluff it up yet again! I checked there were no conflicting files in the git repo, but then had to run the bump-pr command twice and ended up with another conflicting file issue, gah sorry!

[carlocab]

run the bump-pr command twice

That'll do it. Do brew update-reset or git -C $(brew --repo homebrew/core) restore . before re-attempting a failed bump-formula-pr.

[n-ham]

I went through and deleted some old failed bump branches, and it seems to have successfully pushed the most recent one. Thanks for the help..