Better way of separating release and feature branches