Error during update

Community Builds, Projects & Packages
1

Hi,

since I've updated dnsproxy package, I've always that error during update, idea how to fix that?

./scripts/feeds update -a
Updating feed 'packages' from 'https://git.openwrt.org/feed/packages.git;openwrt-23.05' ...
remote: Enumerating objects: 55, done.
remote: Counting objects: 100% (55/55), done.
remote: Compressing objects: 100% (32/32), done.
remote: Total 35 (delta 25), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (35/35), 5.09 KiB | 168.00 KiB/s, done.
From https://git.openwrt.org/feed/packages
   4702db2..ade006d  openwrt-23.05 -> origin/openwrt-23.05
Updating 9caf90f..ade006d
error: Your local changes to the following files would be overwritten by merge:
	net/dnsproxy/Makefile
Please commit your changes or stash them before you merge.
Aborting
failed.

# git stash
No local changes to save
2

Do as it says (git whatever), or if you do not care about the changes:

git status
git reset --hard

including anything else that may be changed in your buildroot.

3

it says to stash or commit, when I do it, nothing happens

git commit
On branch openwrt-23.05
Your branch is up to date with 'origin/openwrt-23.05'.

nothing to commit, working tree clean
4

If you are actually making/submitting a change, you will have create, add, commit, your modifications in a PR to the repo, but what you may want not do is not clear. If just a local change, you can stash / pop.

5

what I did is, only to update the dnsproxy package thats it.

and now I have that error, it is not a big deal but I try to clear it.

6

It is not an error, git is telling you that your changes need to be dealt with so as not to overwrite. If you do not care about the modification, gash it as per above. If you do care, then deal with the change as stated by the message.

And note, your are in a package, you will have to deal with things at the package level.

1 Like