Skip to content

Git workflow

Vyacheslav edited this page May 7, 2017 · 10 revisions

http://nvie.com/posts/a-successful-git-branching-model/ (adopted for monorepo)

Start new module

git checkout -b hl7-model/develop

Start new feature in module

git checkout -b initial-model-finished hl7-model/develop

Finish feature in module

git checkout hl7-model/develop
git merge --no-ff initial-model-finished
git branch -d initial-model-finished
git push origin hl7-model/develop

Start new release

git checkout -b hl7-model/release-0.0.1 hl7-model/develop

Change version in module from the "0.0.1.BUILD-SNAPSHOT" to the "0.0.1.RELEASE"

Finish release

git checkout master
git merge --no-ff hl7-model/release-0.0.1 --no-commit
# do any changes that must go to the release like update changelog
git commit
# commit message must have descriptive title
git push origin master
git tag -a hl7-model/0.0.1.RELEASE
git push origin hl7-model/0.0.1.RELEASE

cd hl7-model
gradle clean bintrayUpload
gradle clean sonarqube

git checkout hl7-model/develop
git merge --no-ff hl7-model/release-0.0.1
git branch -d hl7-model/release-0.0.1
git merge --no-ff master
git push origin hl7-model/develop