Documentation of Git workflow

This commit is contained in:
Michael Hierweck 2019-04-26 11:55:42 +02:00
parent 7592a1d459
commit 9a19a65edc
1 changed files with 35 additions and 0 deletions

View File

@ -28,3 +28,38 @@ see:
Either apply it to specific test configurations or,
better, delete the previous test configurations and amend the JUnit template.
== Git Workflow
The jhipster-generated git branch tracks the history of the JDL model file
and the generated source code. The project has to be resetted to a clean state
(without any generated entitites) before changes to the JDL file can be imported.
# Prepare/Cleanup Workspace
git checkout jhipster-generated
git reset --hard jdl-base
git clean -f -d
git checkout HEAD@{1} src/main/jdl/customer.jdl
git reset HEAD .
# Apply changes to the jdl file
# Invoke JHipster generator
jhipster import-jdl src/main/jdl/customer.jdl --force
# Let Git determine change set between most recent commit and the re-generated source
git reset --soft HEAD@{1}
git reset HEAD .
git add .
# Commit changeset
git commit -m '...'
# Merge changeset into master branch
git checkout master
git merge jhipster-generated