[Geany-devel] Changelog in branches

[Nick Treleaven]

On Tue, 2 Mar 2010 15:23:24 +1100
Lex Trotman <elextr at gmail.com> wrote:

> I've just merged trunk into bs2 branch and of course got a conflict on the
> Changelog file.
> 
> What was the decision on what to do with branch changelogs, I can't
> remember?

I think for the branch changelog it's up to the branch developer(s) how
to handle it.

For merging back to trunk there should be a new item at the top of the
changelog describing a summary of changes in the branch.

Regards,
Nick