Hi Rene,

On Thu, 22 May 2008 22:43:04 +0200 Rene Herman <rene.herman@keyaccess.nl> w=
rote:
quoted text
>
> On 22-05-08 03:24, Stephen Rothwell wrote:
>=20
> > Linux-next is rebuilt every day based on Linus' current kernel.  I merge
> > all the trees I have been told about and fixup minor conflicts (sometim=
es
quoted text
> > reverting commits, sometimes applying patches).  So everyday, linux-next
> > is completely new.  I do not care if the trees I am merging get rebased.
>=20
> This means you're going to redo all those (same) minor conflict fixups=20
> each day again, doesn't it? Or do you pass the fixups back to (one of)=20
> the conflicting trees?

I send email about them and most go away after a day or so i.e. something
changes to make the conflicts go away.  However, the saving grace here is
"git rerere" which remembers these conflicts and their resolutions for me
so I normally only have to fix them once.

quoted text
> > Does that answer your question?
>=20
> But yes, it does, thanks.

OK, good.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/