Commit c224817e authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '15-document-support-of-gitflow-release-branches' into 'master' 

Resolve "Document support of GitFlow release branches"

Closes #15

See merge request to-be-continuous/doc!17
parents adfd0134 7ada3601

.DS_Store

deleted100644 → 0
−8 KiB

File deleted.

View file

.gitignore

+1 −0
Original line number Diff line number Diff line 
/target/

!.mvn/wrapper/maven-wrapper.jar

.DS_Store



### STS ###

.apt_generated

docs/.DS_Store

deleted100644 → 0
−6 KiB

File deleted.

View file

docs/understand.md

+3 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ integration branch or not) with their associated deployment strategy: 


    ![Gitflow-like branching strategy](img/Gitflow-like-strategy.drawio.svg)



    > :bulb: If you're using a complete [Gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) workflow,

    > _release_ branches are managed the same way as regular _development_ branches, possibly deploying to dedicated review environments.



Now, here is a table that summarizes the generic templates behavior for each branch:



<table border="1">