search

spacemunkay / baltimorehackathon

Website for the Baltimore Hackathon
baltimorehackathon.com
4 stars 5 forks source link

Judge organizations don't link to the org's website #11

Closed spacemunkay closed 9 years ago

spacemunkay commented 9 years ago

Add links to the organizations that the judges are associated with.

sastrakhan commented 9 years ago

I attempted to send the following link but my pull request has merging conflicts:

https://github.com/sastrakhan/baltimorehackathon/compare/judges-links

I'm pretty sure I could rebase with my master branch and this would fix the problem (at least I think) but my master branch has a bunch nonsense commits I'm still trying to remove so I don't want to rebase from there until that's cleaned up (I think a command similar to git reset HARD on the master branch would solve this problem but I don't want to act too rash). I emailed a friend about these issues and should hear back before the end of the day tomorrow. From there I can send over something that can be auto-merged.

spacemunkay commented 9 years ago

I've run into that issue before many a time. Worst comes to worst, you can commit your work to the branch, then make a copy of it as another branch and delete the old one and re-pull it. git reset hard works as well, but I admit I google it each time to be sure I'm doing what I want.