> This model is much simpler than the traditional gitflow model and is better 
> suited for github ecosystem based on PR's since there's a single long-lived 
> development branch

The variety of OneFlow being proposed here, if I understand correctly, is the 
one with two long-lived branches (master and develop, let's call it OneFlow+) 
and is actually very similar to GitFlow, the differences AFAIU being not in the 
branch setup, but:

  * release and hotfix branches are fast-forwarded back to master, saving one 
merge commit.
  * (this one is optional) feature branches are rebased before being merged to 
devel, keeping the fine-grained history of the feature out of devel. Some 
people like that, some think it's destroying valuable information since the 
feature branch has a limited life time.
  * more freedom in how to do things than GitFlow. The latter has a detailed 
and rigid idea of the steps to be taken, esp. when one uses its git plugin 
implementation.



So it's basically "keep the history clear" and "leave people some freedom". The 
latter could make OneFlow+ less of an obstacle for code base splits, but IMHO 
neither GitFlow nor OneFlow+ actively help with that: both seem to only support 
"one release builds on the previous one" out of the box.

Reply via email to