Hello,
I started using git-merge-changelog recently (for GNU Texinfo
development), using the debian package, but it never worked correctly
for me. I have added the lines in .gitconfig:
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
driver = /usr/bin/git-merge-changelog %O %A %B
There is also the expected line in .gitattributes.
Typically I make some changes with changes in top of ChangeLog,
someone else has pushed changes to the top of ChangeLog too. I do a
git pull --rebase
The new changes are pulled on top of the ChangeLog, but my changes have
disappeared.
Any idea on what could going on here? Could I have done something wrong?
I am a bit puzzled that this issue is not reported by anybody else.
If it is a possible bug how could it be investigated?
--
Pat
