Hi @doon,

Thank you for this. However, could you please take a look at our Contributing Guide and update your PR accordingly so that we can merge it?

done!

On Fri, Jan 23, 2015 at 1:17 PM, Merott Movahedi notifications@github.com
wrote:

Hi @doon https://github.com/doon,

Thank you for this. However, could you please take a look at our Contributing
Guide https://github.com/ngbp/ngbp/blob/v0.3.2-release/CONTRIBUTING.md
and update your PR accordingly so that we can merge it?

—
Reply to this email directly or view it on GitHub
#349 (comment).

👍

(though I wish npm wouldn't clobber the package.json every time we added something)

@d00n

Could you please rebase this on the latest? We've sorted the list of packages in package.json to avoid issues with npm messing up the dependencies list.

Nothing has changed. You only need to resolve the conflict with yours.

@Merott
Done! However, this being my very first rebase , please advise if I borked it.
tx!

It looks like it hasn't been rebased on the latest master. I expect to see only 1 commit (i.e. squash the branch), and the only change to package.json to be the addition of this line:

"karma-coverage": "^0.2.7",

See this guide:
https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

You're going to get a merge conflict when you run the rebase command, at which point you're going to need to open package.json in an editor, and look for the conflicting line:

<<<<<<< HEAD
    "karma-coverage": "^0.2.7",
=======
>>>>>>> 268901b9ee08103dd1e9ff2a136b1e46ccb78332

Just keep your own change:

    "karma-coverage": "^0.2.7",

It might be easier to make a brand new PR, if you prefer. It's highly recommended that you use a feature branch too.

Hope that helps, and I'm sorry for the rigid requirements.

Hey Team,
Just recreated and submitted this PR as #374, because I felt that it was important...and relatively simple. Take a look and let me know if I should make any changes.