MozillaFoundation / digital-skills-observatory

Digital Skills Observatory Project
12 stars 10 forks source link

included Christabel, sorted names alphabetically. #257

Closed Obadha closed 8 years ago

secretrobotron commented 8 years ago

Hahahah wow. Try this out:

That rebase will catch you up to the recent changes on the repo here, and try to put your latest change on top of those.

I'd do this, too, since add-christabel has your changes, and your gh-pages branch is now "incorrect":

git branch -D gh-pages
git checkout upstream/gh-pages
git checkout -b gh-pages

Then, gh-pages will exactly mirror what's here.

In the future, try to make "feature branches", even for small stuff. Then, you can avoid things like this.

Let me know how it goes!

secretrobotron commented 8 years ago

Ok, scratch all of that. Sorry, I didn't realize this was a pull request from gh-pages to master. The master branch doesn't really mirror the gh-pages branch here (not ideal, but... meh). I'll close this one, and you can make a pull request from your fork to this one.