cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From janpio <...@git.apache.org>
Subject [GitHub] cordova-plugin-inappbrowser issue #225: CB-12975: (docs) Resort and reword c...
Date Tue, 01 Aug 2017 14:37:15 GMT
Github user janpio commented on the issue:

    https://github.com/apache/cordova-plugin-inappbrowser/pull/225
  
    Thanks for the proper explanation! I almost understood it and went to work with Sourcetree...
    
    https://www.atlassian.com/blog/sourcetree/interactive-rebase-sourcetree explains that
interactive rebase is also possible with Sourcetree. But of course I couldn't rebase at the
beginning because I was working on my fork which is not really connected to the apache repo
any more.
    
    So I did as you said and added the apache repo again (while having checked out `patch-1`.
This created this nice merge commit automatically: https://github.com/janpio/cordova-plugin-inappbrowser/commit/3066febdc723c5d0d99ab458c92038fa2f064553
This seems to be what we wanted to "rebase" my commits, because now "This branch is 3 commits
ahead of apache:master. "
    
    Via the "interactive rebase" feature of Sourcetree I could now "merge" my initial commit
and the whitespace commit. But then I somehow messed up, because now the commits from the
merge commit are in my branch as well, additionally to that dumb merge commit in the first
place...
    
    Well, I have to investigate a bit more it seems ;)



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