Github user jsoref commented on the pull request:
https://github.com/apache/cordova-lib/pull/30#issuecomment-46631067
Could you please do a rebase so that there isn't an ugly merge (or multiple
ugly merges) in the history? I've done a number for #9 -- it makes things much
nicer.
A quick check shows that while there is a conflict, it's incredibly tiny,
and trivial to resolve ("pick your change").
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
