Hi Mauro, On Thu, 13 May 2010 02:18:33 -0300 Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> wrote: > > I'll be pulling from Linus on my tree. I did it yesterday, after my last changes, > but it seems that I've made a huge mistake... Several conflicts that I've already > fixed reappeared. I suspect that I've merged it with an older temporary branch > by mistake. That explains it. > Anyway, it is fixed, by simply going back to the last reflog before the error, > and re-merging the new patches again. A pull from Linus didn't show any conflict. > > So, it should be now OK for you to merge. Excellent, thanks. > > Please consider changing your work flow so that you don't rebase things > > in your tree before sending them to Linus. > > I'm already in process of changing my procedure. The problem is that I didn't find > yet a perfect way to handle my tree. I'm getting some new ideas, and intend to implement > them for 2.6.35 development cycle (linux-next for 2.6.36). OK, good. The process doesn't have to be perfect ... ;-) -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpdGwVeN2J3C.pgp
Description: PGP signature
