Carlos,
In [1] that you referenced it says about release branches:
"During that time, bug fixes may be applied in this branch (rather than on the
develop branch)."
To me, that means that new unstable changes should go into develop, but changes
to make the release better should be discussed with the RM and committed to the
release branch if agreed. We want to avoid cherry-picking the develop branch
to the release branch if at all possible.
-Alex
On 8/14/19, 1:58 AM, "Carlos Rovira" <carlosrov...@apache.org> wrote:
Hi Alex,
El lun., 12 ago. 2019 a las 19:30, Alex Harui (<aha...@adobe.com.invalid>)
escribió:
> Also, the other committers should be aware that an RC is being created
> because they see the emails being sent by the CI server and ask the RM to
> agree to accept a commit to the release branch instead of the develop
> branch.
AFAIK, we should always commit to dev branch and not to release branch.
Releases are cut from develop. Only hot-fixes use to be branches that have
commits that fix something important in the release and then use to be
merged back to develop and master. Making commits to release branches could
bring some confusion and problems.
At least from is what I always learnt and used [1]
[1]
https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fnvie.com%2Fposts%2Fa-successful-git-branching-model%2F&data=02%7C01%7Caharui%40adobe.com%7C84d6c89c5d284a001ddf08d72095850a%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C1%7C637013698867612965&sdata=yGlrwnkreBblWjBtMMmpWJD4Cwk7q2tx62B97kn2F5o%3D&reserved=0
--
Carlos Rovira
https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%7C84d6c89c5d284a001ddf08d72095850a%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C1%7C637013698867622965&sdata=dgVvkG6rNkPhYuSJ6FkuHgXFKzUJi2Qxuknk5iuPYS0%3D&reserved=0
