search

fossasia / gci14.fossasia.org

FOSSASIA Google Code-In Website 2014/15 http://gci14.fossasia.org
1.57k stars 109 forks source link

Reworking layout and design of social icons in footer #210

Closed namangoel1 closed 9 years ago

namangoel1 commented 9 years ago

@RoonyH sorry for the messed up commits, seems like it can't auto merge. If you give the thumbs up, I'll merge on my end manually.

roonyh commented 9 years ago

What is going on with git though! I'd love to know why this is happening. Anyway looks good at http://namangoel1.github.io/fossasia.github.io/. Can you try one more time with git?

namangoel1 commented 9 years ago

What shall I try @RoonyH? Not too certain.

roonyh commented 9 years ago

you can do get reset --hard upstream/master to make your branch exactly like the upstream master. This will loose your work though. and then git cherry-pick 940b29f457a49ab331caee3df38ad519c5d8c406 to get those back. I am not sure if your work can be recovered so back up first.

roonyh commented 9 years ago

im in #fossasia if you need help.

namangoel1 commented 9 years ago

@RoonyH got it working!

roonyh commented 9 years ago

nice! did the reset cherry-pick thing?

namangoel1 commented 9 years ago

Restored it manually from a backup after a hard reset

roonyh commented 9 years ago

hmm. cherry-picking might have done it. anyway glad you got it sorted.