On 07/09/2010 12:11 PM, Inaky Perez-Gonzalez wrote: > On Thu, 2010-07-08 at 17:22 -0700, Denis Kenzior wrote: >> Inaky, >> >> .... >>>> >>>> No worries, take your time. Just as a heads up, I pushed some changes >>>> to src/sms.c today. >>> >>> Grrr -- found the bug and deal with it. However, when I tried to pull >>> your tree to rebase on top, I got weird conflicts on stkutil.c -- don't >>> have time to diagnose now, but just wanted to ask: did you do a rebase? >> >> Yep. > > Rats. Don't. Rebase. A. Public. Tree. Please! :) > >
Maybe we're not talking about the same thing. My workflow is git commit / git am git fetch git rebase git push Regards, -Denis _______________________________________________ ofono mailing list [email protected] http://lists.ofono.org/listinfo/ofono
