feature/squashtest

.gitlab-ci.yml

@@ -30,5 +30,5 @@ pages:
     paths:
       - public
 #  only:
-#    - master
+#    - main
 

README.md

@@ -13,3 +13,24 @@ For a list of goals enter
 
         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
+
+

pom.xml

@@ -156,7 +156,17 @@
                 <configuration>
                     <tychoBuild>true</tychoBuild>
                     <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>
             </plugin>
         </plugins>