[jira] [Closed] (INFRA-6302) Adjusting branches on cordova-cli.git

["David Nalley (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/INFRA-6302?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

David Nalley closed INFRA-6302.
-------------------------------

    Resolution: Fixed
    
> Adjusting branches on cordova-cli.git
> -------------------------------------
>
>                 Key: INFRA-6302
>                 URL: https://issues.apache.org/jira/browse/INFRA-6302
>             Project: Infrastructure
>          Issue Type: Task
>      Security Level: public(Regular issues) 
>          Components: Git
>            Reporter: Braden Shepherdson
>
> Due to some mistakes in the past, the cordova-cli repo has abandoned the old master branch. Now the state of development is the master2 branch.
> So we have two requests:
> First, can the HEAD be changed to point to master2, so that people get it when they clone?
> Second, can the old master branch be deleted? If not, we can delete its contents and replace them with a README pointing people to master2.
> Sorry for the trouble. The old history was a tangle, and merging two long-lived branches proved impossible because of bad rebases, and merges going from future->2.7.x->master in the past, among other things.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira