change workflow documentation #1244
Conversation
rrsettgast
force-pushed
the
docs/settgast/changeGitWorkflow
branch
from
f190269 to
49cf43e
Compare
| | | | ||
| | | | ||
| A----B----C----D----E----F-----G------------ (develop) | ||
| \ / \ / (tag v1.2.0) |
There was a problem hiding this comment.
The tags go on develop? I'm not sure it matters but I think it's easiest with a GitHub release to tag the actual release branch (release in this case).
There was a problem hiding this comment.
Tags are related to commits, but we should tag commits from release branch even if they exist on develop.
| (tag v1.2.1) (tag v1.3.0) | ||
| A----B'---...-----G---------H'-----------J' (release) | ||
| ^ ^\ / \ ^ | ||
| | | \ / \ | | ||
| | | GA--GB \ | (hotfix) | ||
| | | \ | | ||
| A----B----...-----G--------------H---I---J (develop) | ||
| (tag v1.2.0) |
There was a problem hiding this comment.
Should not the hotfix branch go to both release and develop (starting from GB), while there should be no direct link from release to develop (H' to H)
There was a problem hiding this comment.
I have modified the diagram to show a proper merge-back.
|
Are we gonna run nightly tests on the release branch as well? |
No, we shouldn't be changing it very often. |
changes the documentation for the git workflow to go with a simplified gitflow model.