search

Rayman / fusic-meteor

Fusic: Realtime Social Music Collaboration
MIT License
27 stars 12 forks source link

More Changes #6

Closed pepf closed 10 years ago

pepf commented 10 years ago

search interface changes in the youtube api to fetch duration and like/dislike stats as well

Very curious if everything works as expected now; starting to get the hang of it :P

Rayman commented 10 years ago

I've cherry-picked your Search UI improvements commit, it's now integrated into the main branch.

Please do a reset --hard on my branch because our history begins to divert because I didn't import your mongodb files commit.

pepf commented 10 years ago

Could you give me specific instructions for this? I've wasted quite some time on git already. On 8 Jun 2014 11:21, "Ramon Wijnands" notifications@github.com wrote:

I've cherry-picked your Search UI improvements commit, it's now integrated into the main branch.

Please do a reset --hard on my branch because our history begins to divert because I didn't import your mongodb files commit.

— Reply to this email directly or view it on GitHub https://github.com/Rayman/fusic-meteor/pull/6#issuecomment-45432338.

Rayman commented 10 years ago

If you do a git reset --hard upstream/master, you essentially set your history exactly as my history. If you then do a git push --force you also push that history over your old history on your fork. I made sure all your changes were cherry-picked so you shouldn't loose any changes.