Public SourceMage Discussion List

[Bor Kraljič <pyrobor AT ver.si>]

Hellow.

Git is awesome for making changes in branches. However it has problems with 
merging ChangeLog file. There is also a bug on this subject on old bugzilla: 
http://bugs.sourcemage.org/show_bug.cgi?id=14862 

I managed to test suggested git-merge-changelog and I presented results on 
wiki: 
http://www.sourcemage.org/projects/grimoire/wiki/Changelog-merge 

If you work on any devel branch this will be nice improvement. 

kind regards, 
Bor

Attachment: signature.asc
Description: This is a digitally signed message part.