Commit b883ede6 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

feature/squashtest

parent f9ed8f9c
Pipeline #155477 passed with stages
in 2 minutes and 55 seconds
...@@ -30,5 +30,5 @@ pages: ...@@ -30,5 +30,5 @@ pages:
paths: paths:
- public - public
# only: # only:
# - master # - main
...@@ -13,3 +13,24 @@ For a list of goals enter ...@@ -13,3 +13,24 @@ For a list of goals enter
mvn gitflow:help mvn gitflow:help
## Release / Development
This project uses the [Git-Flow Maven plugin](https://github.com/aleksandr-m/gitflow-maven-plugin)
For a list of goals enter
mvn gitflow:help
start a new feature
mvn gitflow:feature-start
finish feature
mvn gitflow:feature-finish
finish and squash commits
mvn gitflow:feature-finish -DfeatureSquash=true
...@@ -156,7 +156,17 @@ ...@@ -156,7 +156,17 @@
<configuration> <configuration>
<tychoBuild>true</tychoBuild> <tychoBuild>true</tychoBuild>
<verbose>true</verbose> <verbose>true</verbose>
<installProject>true</installProject> <installProject>false</installProject>
<gitFlowConfig>
<productionBranch>main</productionBranch>
<developmentBranch>develop</developmentBranch>
<featureBranchPrefix>feature/</featureBranchPrefix>
<releaseBranchPrefix>release/</releaseBranchPrefix>
<hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
<supportBranchPrefix>support/</supportBranchPrefix>
<versionTagPrefix></versionTagPrefix>
<origin>origin</origin>
</gitFlowConfig>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment