Buildsystem clean when updating revision

Hi all

Is there any, correct, way to clean as little as possible when updating the underline code baseline when updating Openwrt revision?

I am working on a sunxi feature based on 19.07 branch. Here and there after a rebase I get packeg conflicts, last one about libubox revision dependencies during package/install.

I of course make clean ./scripts/feeds update -a and ./scripts/feeds install -a after a rebase but it does seem enough tough.

Thanks, bye