On Fri, 24 Sep 2010 at 11:42:11 +0200, Carlos R. Mafra wrote: > > I may clone the wmaker-crm repo to check out how much trouble rebasing > 'next' gives to people. I assume that staying at 'master' and doing > a 'git pull' does not cause trouble, but so far nobody confirmed that.
Ok, I did this while changing the subject of Tamas' patches touching WINGs to stick a WINGs: in the beginning (that's also standard practice and I think it is nice, as it gives the immediate overview of what the patch touches). So I got this: [ma...@pilar:wmaker-crm]$ git branch * master [ma...@pilar:wmaker-crm]$ git pull remote: Counting objects: 137, done. remote: Compressing objects: 100% (84/84), done. remote: Total 84 (delta 75), reused 0 (delta 0) Unpacking objects: 100% (84/84), done. >From git://repo.or.cz/wmaker-crm + 7a3d595...42a7fe0 next -> origin/next (forced update) Already up-to-date. [ma...@pilar:wmaker-crm]$ and 'next' was updated and no black magic was needed. So if people base their work on 'master' and stay out of 'next' while pulling, that will be OK. And I won't mind the occasional 'does not apply patch' if I rebased 'next' for some reason in the meantime (as that will be my "fault"). -- To unsubscribe, send mail to [email protected].
