Homebrew update error that local changes would be overwritten

Question

I'm very new to homebrew and git.

I've done changes to httpd24.rb formula which is in homebrew/apache tap. (Just added the --enable-so configuration argument in the existing formula file)

Now when trying to brew update I'm getting this:

$ brew update
error: Your local changes to the following files would be overwritten by merge:
    httpd24.rb
Please, commit your changes or stash them before you can merge.
Aborting
Error: Failed to update tap: homebrew/apache
Already up-to-date.

Also got this:

$ git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

    Library/Formula/httpd24.rb

nothing added to commit but untracked files present (use "git add" to track)

How can I save the changes to formula and be able to keep homebrew updated?

Answer 1

Please, commit your changes or stash them before you can merge.

Commit you changes git add Library/Formula/httpd24.rb && git commit -m "This is your commit message".

When you run brew update it's work similar to git pull command. If you have non-committed changes you cannot update local repository.

Answer 2

Try this:

cd $(brew --repository)
git reset --hard FETCH_HEAD

Source: Common Issues with Homebrew.

Answer 3

To fix Homebrew issues, run these commands:

git --git-dir $(brew --repository)/.git reset origin/master --hard
git --git-dir $(brew --repository)/.git clean -fd

For Git issues, see:

• How do I resolve git saying “Commit your changes or stash them before you can merge”?