Pull freeze

[deadalnix]

Le 31/07/2012 19:46, Tobias Pankrath a écrit :
> I'm not that fluent in git. Could you explain your approach further?
>
> On Tuesday, 31 July 2012 at 16:43:19 UTC, deadalnix wrote:>
>> We have found the following more successful :
>> - Developing in branches. 1 branch per functionality.
>> - Dev branches are often rebased on master.
> Does that mean that you do
>
> git checkout featurebranch
> git rebase master
> git merge featurebranch // fast forward?
>

You usually don't need to merge.

You also don't need to rebase master all the time, just on a regularly 
basis to not be left behind.