Re: git bikeshedding (Re: triggers in dpkg, and dpkg maintenance)
On Thu, 28 Feb 2008, Ian Jackson wrote:
> Mark Brown writes ("Re: git bikeshedding (Re: triggers in dpkg, and dpkg maintenance)"):
> > I've no idea if anyone involved would consider it acceptable but might
> > merging the triggers branch into the mainline with --squash be a
> > suitable comprimise? This would give a single commit discarding the
> > branch history which isn't ideal but would avoid having the history
> > >from your branch in the main history.
>
> 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.
Cheers,
--
Raphaël Hertzog
Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/
Reply to: