Github user rodms10 commented on the pull request:
https://github.com/apache/cordova-firefoxos/pull/12#issuecomment-45422272
I'm seeing "Removing unused template" as a change in this PR instead of
coming from apache:master. Did you cherry pick that change? You'd need to do
something like this in your repository folder:
``` bash
# add apache repo as upstream remote (if you haven't already)
git remote add upstream https://github.com/apache/cordova-firefoxos.git
# update master from apache repo
git checkout master
git pull upstream master
# update your new-icon branch
git checkout new-icon
git rebase master
# follow git instructions in case there are conflicts
# Once code is ready push it to your repo:
git push -f
```
If you prefer `merge` instead of `rebase`, just change the `rebase` command
to `git merge master`.
Don't forget that you still need the code to copy the `platform_www` folder
from the *platform's* folder to the *project* folder. You can do this by adding
the following to `bin/lib/create.js`:
``` js
shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project',
'platform_www'), project_path);
```
---
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.
---
