[jira] [Updated] (CB-4043) Merge master -> 2.9.x and 3.0.0 -> master

["Andrew Grieve (JIRA)" <ji...@apache.org>]

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

Andrew Grieve updated CB-4043:
------------------------------

    Description: 
Parent issue

General steps:

git pull
git checkout 2.9.x
git merge master 
- resolving conflicts either manually, or by:
   git reset --hard HEAD~1
   git cherry-pick -x COMMIT_THATS_MISSING_AND_CAUSING_CONFLICTS
   git merge master (repeat)

git checkout master
git merge 3.0.0
git push origin master
git push origin 3.0.0
git push origin :3.0.0

  was:Parent issue

    
> Merge master -> 2.9.x and 3.0.0 -> master
> -----------------------------------------
>
>                 Key: CB-4043
>                 URL: https://issues.apache.org/jira/browse/CB-4043
>             Project: Apache Cordova
>          Issue Type: Task
>            Reporter: Andrew Grieve
>            Assignee: Andrew Grieve
>
> Parent issue
> General steps:
> git pull
> git checkout 2.9.x
> git merge master 
> - resolving conflicts either manually, or by:
>    git reset --hard HEAD~1
>    git cherry-pick -x COMMIT_THATS_MISSING_AND_CAUSING_CONFLICTS
>    git merge master (repeat)
> git checkout master
> git merge 3.0.0
> git push origin master
> git push origin 3.0.0
> git push origin :3.0.0

--
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