[jira] [Commented] (JOSHUA-332) Merge 7 branch into master
[ https://issues.apache.org/jira/browse/JOSHUA-332?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16220971#comment-16220971 ] Matt Post commented on JOSHUA-332: -- I am not sure if it's worth merging 7. I'm not saying it's not, I just honestly don't know. There was a lot of work there but it was also a number of ideas that were never fully implemented. We did do quite a bit of work on it, but it may be very far from being able to be merged. You might consider just abandoning those unless you have a clear idea how to pull them in. > Merge 7 branch into master > --- > > Key: JOSHUA-332 > URL: https://issues.apache.org/jira/browse/JOSHUA-332 > Project: Joshua > Issue Type: Task > Components: core >Reporter: Tommaso Teofili >Assignee: Tommaso Teofili > Fix For: 7 > > > As discussed on the mailing list, let's branch _master_ into a _6x_ branch > and merge branch _7_ into _master_ in order to keep developing on top of the > latest in the main branch. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (JOSHUA-332) Merge 7 branch into master
[ https://issues.apache.org/jira/browse/JOSHUA-332?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16220815#comment-16220815 ] Lewis John McGibbney commented on JOSHUA-332: - Damn Tommaso. Is there still a lot of work to do? > Merge 7 branch into master > --- > > Key: JOSHUA-332 > URL: https://issues.apache.org/jira/browse/JOSHUA-332 > Project: Joshua > Issue Type: Task > Components: core >Reporter: Tommaso Teofili >Assignee: Tommaso Teofili > Fix For: 7 > > > As discussed on the mailing list, let's branch _master_ into a _6x_ branch > and merge branch _7_ into _master_ in order to keep developing on top of the > latest in the main branch. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (JOSHUA-332) Merge 7 branch into master
[ https://issues.apache.org/jira/browse/JOSHUA-332?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16220141#comment-16220141 ] Tommaso Teofili commented on JOSHUA-332: [~lewismc], nope the main issue is that as soon as you try to merge 7 in master you get tons of conflicts and it's very time consuming to manually fix them, on the other hand I do not see another way around because commits have been done on both master and 7 which I think would need to be kept in a way that avoids having regressions as soon as we have branch 7 as the new master. So the "only" problem is that I didn't manage to have enough time to merge all those conflicts and then commit and push. > Merge 7 branch into master > --- > > Key: JOSHUA-332 > URL: https://issues.apache.org/jira/browse/JOSHUA-332 > Project: Joshua > Issue Type: Task > Components: core >Reporter: Tommaso Teofili >Assignee: Tommaso Teofili > Fix For: 7 > > > As discussed on the mailing list, let's branch _master_ into a _6x_ branch > and merge branch _7_ into _master_ in order to keep developing on top of the > latest in the main branch. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
