Closed namangoel1 closed 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?
What shall I try @RoonyH? Not too certain.
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.
im in #fossasia if you need help.
@RoonyH got it working!
nice! did the reset cherry-pick thing?
Restored it manually from a backup after a hard reset
hmm. cherry-picking might have done it. anyway glad you got it sorted.
@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.