[
https://issues.jboss.org/browse/JBIDE-20396?page=com.atlassian.jira.plugi...
]
Nick Boldt commented on JBIDE-20396:
------------------------------------
Martin explains the logic here and why pushing to both branches was not (yet) done:
{quote}
(2015-07-28 12:18:39) nickboldt: surely some of those recent changes should be done in
master too?
12:20
(2015-07-28 12:22:32) mmalina: nickboldt: to save work :)
(2015-07-28 12:23:05) mmalina: nickboldt: we started branching because you wanted it
basically (because it was breaking some things)
(2015-07-28 12:23:33) nickboldt: sure but now master is out of date relative to Beta2x
(2015-07-28 12:23:49) mmalina: nickboldt: but we still don't really need two branches.
or so we think. so we agreed to push only to Beta2x now and then take all the changes and
push them to master once Beta2 is released
(2015-07-28 12:23:59) nickboldt: oic
(2015-07-28 12:24:26) mmalina: nickboldt: hopefully there won't be any conflicts
:){quote}
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)