16 Sep
2015
16 Sep
'15
9:46 a.m.
On Wednesday, September 16, 2015 10:56:19 AM Pau wrote:
Develop has been maintained by some developers and the
releases by
others. So in principle the differences were small and a clean merge was
possible but now it is not the case. So in some moment we should make
the effort to merge both branches and solve the conflicts (files which
have been modified in a different way).
Although i don't see as a problem some divergence between development branch
and release branch (we use a branch and not a tag exactly for this purpose), I
agree with you that we should in general avoid to do too much work on release
branch, I mean it's not a problem for this time, and I believe we should not
try to merge the release branch into develop, we can just cherry pitch what we
feel appropriated.
What we can try to do is that for future releases we try to avoid what
happened for this one ;)