Install git-merge-changelog by entering the following commands in the terminal:
sudo apt update sudo apt install git-merge-changelog
Description:
git merge driver for GNU ChangeLog files
ChangeLog files *always* foul up most version control systems in their default configuration. . git-merge-changelog is a tool from gnulib designed to help with this for the case of GNU-style ChangeLogs; it can be used with at least git, bzr, and hg.
Homepage: http://www.gnu.org/software/gnulib/
Version: 20140202+stable-2build1
Section: universe/devel