[
https://issues.apache.org/jira/browse/FINERACT-1154?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17207322#comment-17207322
]
Petri Tuomola commented on FINERACT-1154:
-----------------------------------------
[~aleks] thanks - I've updated the release page as well to remove the
"release-" prefix.
There's one remaining problem though: as we are now branching for releases and
tagging in the release branch - but never merging the release branch back to
develop - the release tag never appears in the commit history on develop, and
also there is no guarantee that any fixes applied in the release branch are
also included in the develop branch. So for example now in the commit history
of develop there is no mention of 1.4.0, and also 1.4.0 branch was x commits
ahead of develop.
To avoid this, should we not rebase develop on the latest release tag after
release? That way we would be sure that all the fixes applied in the release
branch are also included in develop, and also that the release tag appears in
the commit history so you can see the changes applied after the last release.
Or alternatively, merge the release branch back to develop?
[~vorburger] - what do you think?
> Git branch strategy is wrong, use tags instead
> ----------------------------------------------
>
> Key: FINERACT-1154
> URL: https://issues.apache.org/jira/browse/FINERACT-1154
> Project: Apache Fineract
> Issue Type: Bug
> Reporter: Michael Vorburger
> Assignee: Petri Tuomola
> Priority: Major
> Fix For: 1.5.0
>
>
> It seems wrong to me that we have 20 open branches (on
> https://github.com/apache/fineract/branches), including for the just released
> 1.4.0. IMHO a 1.4.0 should be a tag not a branch, and there could be a branch
> named 1.4.x instead - if anyone actually wanted to maintain that (which I
> doubt anyone does).
> [~aleks], [~ptuomola] or anyone else reading along here, do you agree?
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
