Closed Obadha closed 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.
Hahahah wow. Try this out:
upstream
is in your remotesgit remote add upstream git@github.com:MozillaFoundation/digital-skills-observatory.git
gh-pages
git checkout -b add-christabel
to make a new copy of your changesgit fetch upstream
to get current changes from this repogit rebase upstream/gh-pages
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 yourgh-pages
branch is now "incorrect":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!