[
https://issues.apache.org/jira/browse/CB-7302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14096046#comment-14096046
]
Andrew Grieve commented on CB-7302:
-----------------------------------
Subject here is a bit scary. You shouldn't ever rebase a remote branch... With
4.0.x, I think we'd only ever want to do `git checkout 4.0.x && git merge
master`, never in the other direction.
> Rebase master onto 4.0.x branch, better document refactor of PluginManager
> --------------------------------------------------------------------------
>
> Key: CB-7302
> URL: https://issues.apache.org/jira/browse/CB-7302
> Project: Apache Cordova
> Issue Type: Task
> Components: Android
> Affects Versions: 4.0.0
> Reporter: Joe Bowser
> Assignee: Andrew Grieve
>
> The merge doesn't apply cleanly, when when rebasing master on top of 4.0.x,
> it turns out that the refactor of PluginManager that was done on master is
> why. This needs to be fixed and documented.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
