Hi Rene, On Thu, 22 May 2008 22:43:04 +0200 Rene Herman <rene.herman@xxxxxxxxxxxx> wrote: > > On 22-05-08 03:24, Stephen Rothwell wrote: > > > 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 (sometimes > > reverting commits, sometimes applying patches). So everyday, linux-next > > is completely new. I do not care if the trees I am merging get rebased. > > This means you're going to redo all those (same) minor conflict fixups > each day again, doesn't it? Or do you pass the fixups back to (one of) > 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. > > Does that answer your question? > > But yes, it does, thanks. OK, good. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpqp3FYPqCoO.pgp
Description: PGP signature
_______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
