I'm maintaining Ubuntu 16.04.6 LTS and Debian 4.9.210-1 systems.
When I apt-get upgrade
, I often get the notice that my local configuration files have changes to the updated package configuration files.
That makes sense, because I tweak these configuration files to my needs, e.g. increase memory settings in PHP, make Apache hide version numbers in HTTP responses etc.
Logically, I want to keep my edited configuration files during each apt-get upgrade
, but unfortunately, over time my locally changed configuration files diff more and more from the vanilla package versions witch each upgrade, as updated vanilla package configuration file change themselves: The package maintainers fix a typo in a comment, add a comment, change its formatting, add a new option and such.
These ever-increasing diffs make it harder and harder to see the relevant changes in updated configuration files.
To make it easier to read these diffs during the next upcoming upgrades, I'd like to incorporate the non-relevant changes (updated comments etc.) into my locally changed configuration file while keeping my relevant changes intact.
Is there an easy way to "cherry-pick" only those configuration file changes that I'm interested while leaving my local configuration intact?