[
https://issues.apache.org/jira/browse/FINERACT-1154?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17207333#comment-17207333
]
Aleksandar Vidakovic commented on FINERACT-1154:
------------------------------------------------
[~ptuomola] thanks for taking care of the doc fix.
Concerning merging release branches back to develop: I might be wrong here, but
wouldn't that create a couple of problems (technically not errors though)...
not sure if I can describe this properly, but it would kind of create some
duplication (at least with the current way that back-porting is done). Let's
assume we created the release branch and on develop people continue
contributing. Some of those contributions need to be back-ported to the release
branch (release period is a couple of weeks, not all contributors will be ready
on the spot with their changes). The way it's currently done is to create
another pull request based on the release branch and re-apply the changes that
went into develop (I assume that sometimes it's copy-paste); technically this
PR is independent from the PR that went into develop (other than mentioning it
in the title). If we would merge the release branch back to develop we would
see in git log two separate commits for the same features/fixes (again, without
any correlation other than any reference in the title). And they could be days
if not weeks apart without any help of Git to relate them which what I suppose
is the intention here.
If we go your suggested route - I actually like the idea to make sure every
change is accounted for - then we should cherry pick the features/fixes from
develop instead of creating new PRs.
> 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)
