[Dctrl-tools-devel] [SCM] Debian control file query tools branch, maint-2.20, updated. 2.20-15-g952ecbf

Antti-Juhani Kaijanaho antti-juhani at kaijanaho.fi
Thu Dec 8 06:44:53 UTC 2011

On Wed, Dec 07, 2011 at 09:25:25PM +0000, David Prévot wrote:
>     Merge branch 'master' into maint-2.20

Normally, that'd be a bad idea, but it was benign here.

But just to make sure it's clear:  Merging from master to maint-x.y will merge
everything in master to maint-x.y.  Often one would expect master to have
changes that do not belong in maint-x.y (such as new code introducing new
strings), and a merge like this would merge those too.  Normally, one would use
cherry-pick to copy stuff selectively from master to maint-x.y.

In this case there's no harm as master had nothing that doesn't belong in

Antti-Juhani Kaijanaho, Jyväskylä, Finland

More information about the Dctrl-tools-devel mailing list