In short, as someone who generally just wants to author some content out here it is extremely frustrating having to deal with the staging branches in these 2 repos. Especially when I am trying to do a release. In fact, authoring content for these 2 related to the release is now my #1 hurdle/roadblock when doing a release. So when I am working on a release and need to "grab the latest content from in.relation.to and hibernate.org and start adding my content" what are the steps I am expected to take? Because every time I get stuck in a maze of forced update merge conflicts.

Do you want to see the changes on staging before releasing, or are you confident that these changes will work? Most of my work on hibernate.org and in.relation.to are on the production branch directly. Especially since I do render things locally first. I occasionally force push a change to staging to discuss it with others. Emmanuel > On 03 Sep 2015, at 19:40, Steve Ebersole <steve(a)hibernate.org&gt; wrote: > > In short, as someone who generally just wants to author some content out > here it is extremely frustrating having to deal with the staging branches > in these 2 repos. Especially when I am trying to do a release. In fact, > authoring content for these 2 related to the release is now my #1 > hurdle/roadblock when doing a release. > > So when I am working on a release and need to "grab the latest content from > in.relation.to and hibernate.org and start adding my content" what are the > steps I am expected to take? Because every time I get stuck in a maze of > forced update merge conflicts. > _______________________________________________ > hibernate-dev mailing list > hibernate-dev(a)lists.jboss.org > https://lists.jboss.org/mailman/listinfo/hibernate-dev