[Geany-devel] Changelog in branches

Lex Trotman elextr at xxxxx
Tue Mar 2 23:32:39 UTC 2010


On 2 March 2010 23:19, Nick Treleaven <nick.treleaven at btinternet.com> wrote:

> 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.
>


Too easy, thanks Nick

Cheers
Lex

>
> Regards,
> Nick
> _______________________________________________
> Geany-devel mailing list
> Geany-devel at uvena.de
> http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.geany.org/pipermail/devel/attachments/20100303/b6a103a5/attachment.html>


More information about the Devel mailing list