marckunze / rancor

Ranked Choice voting tool repo
https://rancor.herokuapp.com
Other
0 stars 0 forks source link

Familiarize with git/github #11

Closed marckunze closed 9 years ago

marckunze commented 10 years ago

I think we've addressed this already, but if anyone isn't familiar with git and github itself please try to get a basic understanding of how to do some basic interaction with it. I barely know anything beyond this basics, but it's worth noting since we'll be interacting with it.

Git tutorials

http://git-scm.com/doc and the youtube series from github

http://youtu.be/FyfwLX4HAxM?list=PLg7s6cbtAD15G8lNyoaYDuKZSKyJrgwB-

Also, I think with hills you have to use SSH to work with github since they're running an old version with won't let you use plain http.

https://help.github.com/articles/generating-ssh-keys/

Cloning this repo

  1. Set up git including user.name and user.email (https://help.github.com/articles/set-up-git/)
  2. Generate SSH key and add to your github account (required if you're working from hills)
  3. clone repository
  4. via SSH git clone git@github.com:marckunze/rancor.git
  5. or via HTTP git clone https://github.com/marckunze/rancor.git
  6. that should copy the README, the .gitignore and a .git subfolder to a directory named rancor in wherever your working directory is.
  7. cd to your rancor/ directory
  8. Do another clone, but with the wiki
    • via SSH git clone git@github.com:marckunze/rancor.wiki.git
    • or via http https://github.com/marckunze/rancor.wiki.git
  9. You should have a new rancor.wiki/ directory with the Functional_Spec.md and a Home.md in it.

I hope this helps if anyone is new to git or has problems accessing the repositories.

marckunze commented 10 years ago

Also worth noting for the basic git commit

git add fname1 fname2 fname3 git commit -m "added some files git push origin master

marckunze commented 10 years ago

And for pulling the most recent changes

git fetch origin git diff origin/master git merge origin/master

http://stackoverflow.com/questions/2514270/how-to-check-for-changes-on-remote-origin-git-repository

marckunze commented 9 years ago

Forgot the obvious part where you install git. https://help.github.com/articles/set-up-git/

marckunze commented 9 years ago

I have some free time tomorrow afternoon if anyone needs some help getting setup with git, ruby, or heroku. I wasn't planning to come to campus early, but let me know if you want to meet.

Or if it would help we could try to schedule a meeting outside of class if anyone thinks that would be of value. I'm just not sure how easy it would be to get us all in the room, or if that is even necessary.

dennisccsf commented 9 years ago

I am interested in getting some help on catching up. Anytime before class will work for me. Thanks.

marckunze commented 9 years ago

Want to do 4:30 or so?

dennisccsf commented 9 years ago

I can do that. See you then.

marckunze commented 9 years ago

ok, where should we meet? My default is usually just the cafeteria, but I don't really know campus too well.

dennisccsf commented 9 years ago

let's meet in front of the classroom and decide from there.

marckunze commented 9 years ago

k, see you tomorrow

ghost commented 9 years ago

Hi, I'm trying to get off work early today, to be there at 4:30PM, too. (I started work super early to be able to get out and meet with you guys). I'm hoping to be able to make it on-time, I drive from downtown. See you guys

ghost commented 9 years ago

Hi, Please let me know where you are meeting, if the classroom was in use. I know the 1st floor has some sort of study room.

Im arriving near 5.

Thank you Pouria

Sent from my iPhone

On Nov 20, 2014, at 12:11 AM, Marc Kunze notifications@github.com wrote:

k, see you tomorrow

— Reply to this email directly or view it on GitHub.

marckunze commented 9 years ago

As noted elsewhere you probably want to install ruby version manager

https://rvm.io/rvm/install

marckunze commented 9 years ago

And the cheat sheet https://training.github.com/kit/downloads/github-git-cheat-sheet.pdf

nvh82 commented 9 years ago

Okay, I was able to clone the repository and wiki. I think I should be ready to go. Thanks for the tips Marc, very helpful.

marckunze commented 9 years ago

great

dennisccsf commented 9 years ago

finally got rvm working. needed some time to read instructions carefully. i can load the app on my local machine. thanks marc.

ghost commented 9 years ago

I found this link to be very concise & helpful: http://rogerdudler.github.io/git-guide/

marckunze commented 9 years ago

Well everyone has had a chance to commit, I'll close this one out tomorrow night unless anyone objects.