Re: [hibernate-dev] Branching strategy in OGM

So you intend to do some evil history rewriting on branch 4.2? I don't think that's expected to happen on the reference repository.

merge them wherever you want. Pretty sure I don't want to touch branch 4.2 myself.

> We did it intentionally that way to avoid any kind of back/forward porting > and keep the history linear. > > It's not that these branches are there for a long time, probably only until > tomorrow. 4.2 is meant to be rebased onto master and finally fast-forward > merged to master once 4.1.2 is out. Would be something different if there > was a long-lasting 4.1 branch which needs parallel maintenance, then I'd do > what you suggest. > > --Gunnar > > > > 2015-02-26 15:16 GMT+01:00 Sanne Grinovero <sanne(a)hibernate.org&gt;: >> >> Hey all, >> it seems like the branch for maintenance work on OGM 4.1 is (still) >> called "master", while a branch "4.2" was created for future work. >> >> I'd really prefer it the other way around: create a branch "4.1" to >> host all changes which are needed to be backported on 4.1.x , and call >> "master" what will receive all of the latest improvements. >> >> Let's see on IRC when it is a good time to rename the branches? It >> better happens "atomically" or it's a mess.. >> >> Sanne >> _______________________________________________ >> hibernate-dev mailing list >> hibernate-dev(a)lists.jboss.org >> https://lists.jboss.org/mailman/listinfo/hibernate-dev > > _______________________________________________ hibernate-dev mailing list hibernate-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev