You are viewing a plain text version of this content. The canonical link for it is here.

Posted to issues@cordova.apache.org by "Shazron Abdullah (JIRA)" <ji...@apache.org> on 2014/01/09 02:51:51 UTC

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

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

Shazron Abdullah resolved CB-4043.
----------------------------------

    Resolution: Fixed

> 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 was sent by Atlassian JIRA
(v6.1.5#6160)