[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: git bikeshedding (Re: triggers in dpkg, and dpkg maintenance)

On Thu, Feb 28, 2008 at 08:51:41PM +0100, Raphael Hertzog wrote:
> On Thu, 28 Feb 2008, Ian Jackson wrote:

> > Does this not also suffer from the problem that branches made from my
> > triggers branch become unuseable or difficult to merge ?

> git merge --squash is more or less equivalent to applying the patch
> corresponding to the whole branch. So it will also break merging from
> other branches based on the merged branch.

Well, they'd need to be squashed down too or similar were they merged
but it just reduces to the same problem as you've got with keeping the
history of the triggers branch out of mainline.

"You grabbed my hand and we fell into it, like a daydream - or a fever."

Reply to: