cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From convey-mane <...@git.apache.org>
Subject [GitHub] cordova-plugin-camera pull request: iOS: new resizable cropping re...
Date Thu, 12 Nov 2015 08:52:30 GMT
Github user convey-mane commented on the pull request:

    https://github.com/apache/cordova-plugin-camera/pull/131#issuecomment-156036480
  
    OK, back again (and after reading a lot about `rebase` :wink:);
    
    maybe first things first …
    
    @daserge to your suggested `rebase`, just to be shure and not to cause any damage or lose
commits (being _very_ new to Git and GitHub):
    from `<myGitHubPath>/cordova-plugin-camera/`, with `git remote -v` giving me
    ```
    apache	https://github.com/apache/cordova-plugin-camera.git (fetch)
    apache	https://github.com/apache/cordova-plugin-camera.git (push)
    origin	https://github.com/conveyGmbH/cordova-plugin-camera.git (fetch)
    origin	https://github.com/conveyGmbH/cordova-plugin-camera.git (push)
    ```
    I would do
    ```
    git fetch apache
    git checkout master
    git rebase apache/master
    git push --force origin master
    ```
    - maybe the first line isn't necessary, as GitHub Desktop already shows me all the latest
commits  from your repository(?);
    - if the `rebase` comes up with conflicts (which I don't expect(?)), I would resolve them
and do an additional  `git rebase --continue` before the `push`.
    
    Is that right?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org
For additional commands, e-mail: dev-help@cordova.apache.org


Mime
View raw message