Hi, thank you for all the clarifications! It spared us of some headaches along the line. And also thank you for the links, I was not aware of these resources yet.
Best regards, Timea On Thu, 11 Oct 2018 at 22:10, Puja Valiyil <[email protected]> wrote: > Just to tack onto David’s answers: > Master contains the latest code, it also contains the upgrade to rdf4j > (from openrdf). A number of developers work on systems that could not > upgrade to rdf4j, and as a result we maintain a 3.x branch that is > compliant with the openrdf Api. Developers commit to either/or, it is up > to the developer to forward or backport features as they want between > master and the 3.x branch. > > Sent from my iPhone > > > On Oct 11, 2018, at 3:37 PM, David Lotts <[email protected]> wrote: > > > > Timea, > > Thanks for reaching out. > > Some of your questions are addressed here in the wiki: > > https://cwiki.apache.org/confluence/display/RYA/Contributing+to+Rya > > But there is still room for confusion. Your questions are good, and might > > be something we should add to that document more explicitly. > > > > - your master branch is the one containing the official releases > correct? > >> > > No, master branch contains the current development snapshot. Create a > > request to pull your work into master. > > > > > >> - the 3.x/master branch is actually the branch were current > >> development is done? > > > > No, I believe 3.x/master is to track changes for a major modification to > > use the latest release of rdf4j library. You should use master unless > you > > want to work on that rdf4j upgrade. > > > > > >> (the equivalent of the develop branch in git flow: > >> > >> > https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow > >> ) > >> Correct? > > > > Not really, our master is their described develop branch. Their master > > branch has no corresponding branch, but instead we use *tags* to track > each > > release. This is how a bunch of our peer projects do it. > > > > (even is rya is set to 4 the branch 3.x name is misleading, maybe > >> consider renaming it in the future) > >> > > I agree, it does seem confusing. 3.x refers to a future major breaking > > version. > > > > > >> - if we want to do pull requests we would do them on 3x/master branch? > >> > > No, use master. > > > > - do you have a place to report tickets/issues? (other projects make > use > >> of git issues) > >> > > Yep, Jira. If you are new you'll need to create a user account: > > https://issues.apache.org/jira/browse/RYA > > > > Let us know if you have problems doing that. > > > > david. > -- *Timea Turdean, MSc* Software Engineer Semantic Web Company GmbH EU +43 1 402 12 35 US: (415) 800-3776 https://www.poolparty.biz https://www.semantic-web.at https://drupal.poolparty.biz *E-Book*: Introducing Semantic AI <https://www.poolparty.biz/machine-learning-meets-semantics/> The views and opinions expressed in this posting are those of the author and do not necessarly reflect the official policy or position of Semantic Web Company or any other agency, organization, employer or company.
