2015-02-26 16:38 GMT+01:00 Sanne Grinovero <sa...@hibernate.org>: > 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. >
I don't see a problem with rewriting in this case. It's not master and it's not there for a long time. It's just a temp. working branch. I haven't understood much of it so I'll send PRs to master and let you > merge them wherever you want. Pretty sure I don't want to touch branch > 4.2 myself. > Best is to send PRs to that branch you want them applied to: 4.1.2 -> master, 4.2 -> 4.2. I'll rebase your OGM-747 branch and merge to 4.2. On 26 February 2015 at 15:26, Gunnar Morling <gun...@hibernate.org> wrote: > > 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 <sa...@hibernate.org>: > >> > >> 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@lists.jboss.org > >> https://lists.jboss.org/mailman/listinfo/hibernate-dev > > > > > _______________________________________________ > hibernate-dev mailing list > hibernate-dev@lists.jboss.org > https://lists.jboss.org/mailman/listinfo/hibernate-dev > _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
