Git Branches and repositories June 2018 Knowledge sharing

  • Slides: 9
Download presentation
Git Branches and repositories June, 2018 Knowledge sharing Workshop Eurostat 1

Git Branches and repositories June, 2018 Knowledge sharing Workshop Eurostat 1

Objectives of this presentation � SDMX Tools GIT branches conventions � SDMX-RI at CITnet

Objectives of this presentation � SDMX Tools GIT branches conventions � SDMX-RI at CITnet GIT � How to work with CITnet GIT repositories � How to deal with dependencies June, 2018 Knowledge sharing Workshop Eurostat 2

Branches � Started slowly to use a Git. Flow approach � Active development branch

Branches � Started slowly to use a Git. Flow approach � Active development branch � develop � Latest release branch � master � Specific releases can be found in tags � v. Major. Minor. Patch � Only in SDMX RI Java � Uses Maven plugin jgitflow � In develop branch all versions have –SNAPSHOT postfix June, 2018 Knowledge sharing Workshop Eurostat 3

Git and JIRA � Feature branches have the JIRA Ticket key as name �

Git and JIRA � Feature branches have the JIRA Ticket key as name � SDMXRI-123 � SDMXCONV-XYZ � Feature � For branches start on develop bugfixes � May use a different branch with JIRA tickey as name � Commits � If June, 2018 should have JIRA ticket key it exists and applies Knowledge sharing Workshop Eurostat 4

SDMX Tools at CITnet � Uses Bit. Bucker Server from Atlassian � Needs �

SDMX Tools at CITnet � Uses Bit. Bucker Server from Atlassian � Needs � a CITNet account Public access will end soon � Project � https: //webgate. ec. europa. eu/CITnet/stash/projects/SDMXRI � Project � URL for SDMX Converter and Struval https: //webgate. ec. europa. eu/CITnet/stash/projects/SDMXCONV � GIT � URL for SDMX-RI: URLs format: https: //<CITnet user>@webgate. ec. europa. eu/CITnet/stash/scm/sdmxri/<repository> June, 2018 Knowledge sharing Workshop Eurostat 5

SDMX-RI at CITnet / Creating a branch from Jira June, 2018 Knowledge sharing Workshop

SDMX-RI at CITnet / Creating a branch from Jira June, 2018 Knowledge sharing Workshop Eurostat 10

Working with SDMX-RI repositories � Making 1. 2. 3. 4. 5. 6. 7. 8.

Working with SDMX-RI repositories � Making 1. 2. 3. 4. 5. 6. 7. 8. 9. changes Fork Clone the fork repository. Make code changes Add and commit changes Push to CITnet (and other remotes) Create a Pull request Notify us Discuss, possibly go back to step 2 The changes are merged June, 2018 Knowledge sharing Workshop Eurostat 15

Working with SDMX-RI repositories � Fork � From Stash � Click at Fork link.

Working with SDMX-RI repositories � Fork � From Stash � Click at Fork link. June, 2018 Knowledge sharing Workshop Eurostat 16

Wrap up � Questions June, 2018 Knowledge sharing Workshop Eurostat 31

Wrap up � Questions June, 2018 Knowledge sharing Workshop Eurostat 31