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

Re: Triggers status?

On Wed, 24 Oct 2007, Ian Jackson wrote:
> Raphael Hertzog writes ("Re: Triggers status?"):
> > Well, either you merge or you use rebase. Using both doesn't make
> > much sense!
> This branch has already been merged from the trunk once previously,
> after I published it for the first time.  There were conflicts to fix
> up then too.  So as I understand it that would mean that it's too late
> to rebase ?

1/ Using gitk, I don't find any trace of that previous merge.
2/ It's never too late, it's just a bit less handy, cf what I said in the
previous mail.

> I think the rebase workflow doesn't really work for something as
> substantial as this which has to be published and examined by others
> while development continues on the trunk.

I don't see why it wouldn't work.

Raphaël Hertzog

Premier livre français sur Debian GNU/Linux :

Reply to: