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
