Code party

[andeeliao]

Event page for code party

[ehashman]

Please rebase your commits, you have extraneous merges.

[ehashman]

Less the comments, LGTM. Will need to fix the git problems before this is mergeable though.

[ehashman]

Okay, if you insist on closing this pull request, please run the following commands (assuming you've set up your repo like I suggested in the README):

git checkout master
git fetch upstream
git rebase upstream/master
git checkout -b code-party-secondattempt
git cherry-pick 80b5d49
git push origin HEAD

[andeeliao]

Hey Elana,

I tried those commands but am still having the same problem. It seems that when I fetch upstream, rebase and checkout my master branch still has the extraneous commits... not sure how to fix this :S the secondattempt still has the commits from september

[fboxwala]

Hey Andee, wanna try this instead:

git reset --hard 118ebcb git fetch upstream git rebase upstream/master git push --force origin HEAD

[ehashman]

+1 to Fatema's instructions. I didn't realize that your master itself had the merge problem, which means you'll need to reset that in addition to this branch!

[andeeliao]

Hmm, it still shows that I'm 1 commit ahead on my master branch. I checkout'd master before I applied Fatema's instructions, not sure if that makes a difference.

[ehashman]

Please hop on IRC so we can pair on this!

[andeeliao]

Roger that!