search

jasonLaster / DGD

Dartmouth Group Directory
MIT License
6 stars 3 forks source link

Added suggested organizations #53

Open dexteryz opened 12 years ago

dexteryz commented 12 years ago

Basic flavor on the sidebar.

I was thinking about adding a jQuery newsticker at the top but ran out of time for tonight. Will try that out later this week if it looks good.

haplesshero13 commented 12 years ago

Hey Dexter, I suggest that you add your sublime project settings to the gitignore, and squash or checkout and recommit your changes so that those files don't appear in the history. This keeps our working history cleaner.

dexteryz commented 12 years ago

Thanks! Should be fixed now.

haplesshero13 commented 12 years ago

Dexter, you haven't squashed or recommitted your changes, nor have you deleted the commit sublime project files yet!

haplesshero13 commented 12 years ago

Your fork is also many commits behind. If you re-merge with master, that would be excellent.

dexteryz commented 12 years ago

is it working now?

haplesshero13 commented 12 years ago

Do you think you could squash the commits into a single one? That would make things cleaner...

Probably the easiest way to do this is to clone our current master into a new directory, then overwrite everything in that directory with your current changes. Then, recommit, and check that everything is the same in the end.

Or you could learn to use git rebase -i and the squash command. ;)

dexteryz commented 12 years ago

haha will learn no prob :P

On Sat, Jun 16, 2012 at 4:59 PM, haplesshero13 < reply@reply.github.com

wrote:

Do you think you could squash the commits into a single one? That would make things cleaner...

Probably the easiest way to do this is to clone our current master into a new directory, then overwrite everything in that directory with your current changes. Then, recommit, and check that everything is the same in the end.

Or you could learn to use git rebase -i and the squash command. ;)

Reply to this email directly or view it on GitHub: https://github.com/jasonLaster/DGD/pull/53#issuecomment-6377564

Dexter Zhuang dexter.zhuang@gmail.com Mobile: 1-248-974-8738 Twitter: @dexteryz Blog: www.dexteryz.com