FirstGitPractice

A repository to use to get familiar with Git and GitHub

##Preliminary work##

Complete the following online exercise: https://try.github.io/levels/1/challenges/1

In Class

###Linux###

0. Open a terminal
1. Make sure git is installed.
2. [Generate SSH keys to use with GitHub] (https://help.github.com/articles/generating-ssh-keys)
3. Stop.

In your web browser

1. Log into GitHub.

2. Fork the cs360f14/FirstGitPractice repository. This is the upstream repository.

3. In your forked copy, use the online file editor to edit dataFile.md. This is a file of favorite movies and/or songs. Make sure you provide a good commit message and look at the GitHub flavored markdown and Markdown Basics

4. Issue a pull request back to the original repository. Green button at the top left.

5. Review at least one other student’s pull request to indicate if that student followed directions correctly. Do this by navigating back to cs360f14/FirstGitPractice and looking through the pull requests. The upside-down U icon on the right of the repository.

6. Wait for a few minutes for your pull request to get accepted back to the upstream repository and for everyone to catch up.

From the GitHub Shell or command line:

0. Do not copy and paste these commands. The " and " do not copy well.

1. git clone git@github.com:USERNAME/FirstGitPractice.git

2. cd FirstGitPractice

3. dir - see the files in this directory

4. cat dataFile.md - list the contents of the file dataFile.md

5. git remote add upstream git@github.com:cs360f14/FirstGitPractice.git

6. git fetch upstream

7. git merge upstream/master

8. dir

9. cat dataFile.md

10. Edit dataFile.md with Geany to add a second favorite movie.

11. git add dataFile.md

12. git commit -m “added a second favorite movie” You can customize the commit message in this step

13. git push origin master

14. git push upstream master This will generate a pull request back to cs360f14/FirstGitPractice. You could have done this step in your web browser as you did in step 4. You must generate the pull request from your web browser.

NOTE: Step 4 and 5 could be replaced with the single step: git pull upstream master

##Git with Branches

From the GitHub Shell or command line:

Why would I want to branch? A branch creates an editable copy of the repository so you can make commits without necessarily putting the commits into the main line of development. This is good for adding a feature, a bug fix, or some other set of commits that make end up as a pull request back to another Git repository.

The last reason, for a pull request, is especially important. If you make a pull request and the target of the pull request asks you to modify the pull request in any way, you can just make changes on that branch and the pull request is altered. Once the pull request is accepted, or the changes from the branch are merged back into main, the branch can be deleted (but this is not required).

1. Starting from the directory FirstGitPractice again
2. Make sure you are up-to-date.

• git fetch upstream
• git merge upstream/master
  • Resolve conflict if necessary
  • edit file, remove >>> ==== <<< lines
  • git add ...
  • git commit -m "message"
• git push origin master

2. git branch AddAuthors_PUNetID
3. git checkout AddAuthors_PUNetID
4. Use Geany to edit dataFile.md and add your favorite author to the end of the file
5. git add dataFile.md
6. git commit -m “added an Author” You can customize the commit message in this step
7. git push origin AddAuthors_PUNetID Push the commits from AddAuthors branch to origin. Also: Generate a pull request to cs360f14/FirstGitPractice from your web browser if one is not automatically generated.
8. Go look at your pull request on the AddAuthors_PUNetID branch in cs360f14/FirstGitPractice.
9. Now I want you to change the Author's name to either ALL CAPS or all lowercase letters. Use Geany to do this locally.
10. git add dataFile.md
11. git commit -m “added an Author ALL CAPS”
12. git push origin AddAuthors_PUNetID
13. Go look at your pull request on cs360f14/FirstGitPractice. Does it reflect the new commits?
14. Wait for the pull request to get accepted.
15. git checkout master You may see the following error. That is acceptable.

Switched to branch 'master'
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)

17. git fetch upstream master Get changes from the group repository
18. git merge upstream/master
19. git branch -d AddAuthors_PUNetID
20. git push origin master
21. Optionally delete the AddAuthors_PUNetID branch on USER/FirstGitPractice on GitHub.

###Further Documenation### [Fork A Repo] (https://help.github.com/articles/fork-a-repo)

###A few terms:### origin: git@github.com:USERNAME/FirstGitPractice.git - the address of your GitHub repository

upstream: git@github.com:cs360f14/FirstGitPractice.git - the address of the original GitHub repository

master: the master branch in the local repository