openerp-community team mailing list archive

[David Arnold - El Alemán <david@xxxxxxxxxxx>]

I cannot make a complete 1:1 match on the subject, as I don't understand it
enterely. But here's what the doc says:
http://git-scm.com/book/en/Git-Branching-Rebasing#The-Perils-of-Rebasing


----------------------
*David Arnold B.A. HSG*
*Gerente*

+57 315 304 1368
david@xxxxxxxxxxx
www.elaleman.co

​El Alemán S.A.S, Carrera 13 # 93 - 40 P4, Bogotá D.C, Colombia


2014-06-12 8:38 GMT-05:00 Stefan <stefan@xxxxxxxx>:

> Hi Raphael,
>
> thanks for taking a look!
>
>
> On 12-06-14 15:02, Raphael Valyi wrote:
>
>>
>>
>> I have no doubt that it's better to manage the final patches of a branch
>> with Github rebase interactive. Now I'm not 100% convinced yet it's the
>> best for OCB given OCB may still receive additional local patches for
>> production (were no agreement exists yet or because it's a qucik and dirty
>> production hotfix without hope to merge it upstream).
>> Because one should remember that derivating from a branch that is rebased
>> constantly is possible but not easy.
>>
>>
> You could be right about that. I'll do some tests myself, and maybe some
> of the other more git-knowledgeable people can chip in.
>
> Cheers,
> Stefan.
>
>
> --
> Therp - Maatwerk in open ontwikkeling
>
> Stefan Rijnhart - Ontwerp en implementatie
>
> mail: stefan@xxxxxxxx
> tel: +31 (0) 614478606
> web: http://therp.nl
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-community
> Post to     : openerp-community@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openerp-community
> More help   : https://help.launchpad.net/ListHelp
>