I understand. I will default my IDE to always use rebase. I will keep working in my 'messed up' branch, if only to maintain a consistent naming across the 'flex-asjs', 'flex-falcon' and 'flex-sdk' repos.
Thank you for your time and effort explaining this. I think I have learned something new about the use of git. EdB On Fri, Jul 11, 2014 at 10:03 AM, Jose Barragan < jose.barra...@codeoscopic.com> wrote: > Hi Erik, > > Thats it, but… > I recommend use of merge too, just for releases, hot-fixes y pull-request, > due that those branches are in fact extremely dependents of their bases, > but for normal developing (tickets, experimentals, etc…) the best is rebase > way with "git pull --rebase" instead of "git pull”. > > _________ > Jose Barragan > Senior Software Engineer > Codeoscopic > +34 912 94 80 80 > http://www.codeoscopic.com > > On 11 Jul 2014, at 09:03, Erik de Bruin <e...@ixsoftware.nl> wrote: > > > Ok, in short: you're saying ALWAYS use rebase, so we get a nice flat > > 'history'? > > > > EdB > -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
