SNOMED International Mapping Tool

Space shortcuts

Child pages
  • Versioning "develop" and "master"

Versions Compared

Old Version 9

changes.mady.by.user Rick Wood

Saved on

compared with

New Version 10

changes.mady.by.user Deborah Shapiro

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. Switch to the "master" branch.  Do a pull if you don't have the latest changes on the "master" branch.
  2. Use CherryPick in TortoiseGit to merge the desired commit(s) from develop into master:
    1. Using TortoiseGit, select Show Log.  
    2. In the top left-hand corner there will be a hyperlink saying "master".  Hit that to open a dialog box showing other branches, and select the "develop" branch.
    3. Select the commit(s) to be included in the hotfix, right-click, and choose "Cherry pick this commit".  Follow the prompts to in the next screen to merge this/these commits into master.

  3. Use "mvn versions:set" to change the versions of the master branch.  For hotfixes, the convention is to add an underscore+letter to the current version.  e.g. If the current version is 1.5.2, then update the version to 1.5.2_a.  If another hotfix is deployed before the next full merge from develop into master, increment the letter to 1.5.2_b, and so on.

    Code Block
    cd /path/to/OTF-Mapping-Service
mvn versions:set
... when prompted, type in the version plus the hotfix suffix (e.g. 1.5.2_a)
cd parent/
mvn versions:set
... when prompted type in the version plus the hotfix suffix (e.g. 1.5.2_a)
 
... Note: If you make a mistake, use mvn versions:revert.


  4. Commit the "master" branch changes and push.

...