cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kamrik <>
Subject [GitHub] cordova-lib pull request: CB-3571: support for <splash> element in...
Date Fri, 20 Jun 2014 15:05:03 GMT
Github user kamrik commented on the pull request:
    The "Merge remote..." commits are not that horrible, we have plenty of those in our repos
and they have some benefits. But if you want to avoid them, try some of the below
        git checkout YourBranch
        git rebase master
        git checkout master
        git merge YourBranch
        git checkout master
        git cherry-pick <hash-or-your-change>
    The disadvantage is that it creates a new commit with (nearly) identical content but different
hash. But we often do it anyway when editing a commit message with git commit --amend to add
stuff like 
    github: clonse PRnumber
    A simple and somewhat brutal way of squashing a pull request into a single commit without
preserving authorship or any other info from the original commits in the PR
    curl | git apply
    A similar way to just apply all the commits from a PR onto you current HEAD while preserving
all the commit info. Similar to first rebasing and then merging.
    curl | git am
    In some cases, if the conflicts are annoying enough, I just use a graphical diffing/merging
tool (like meld) between two independent clones of the repo to copy the changes as a new commit
on top of master. Especially when I need to break one commit into several (the opposite of

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 or file a JIRA ticket
with INFRA.

View raw message