Skip to content

Latest commit

 

History

History
127 lines (65 loc) · 2.97 KB

git-exercise.md

File metadata and controls

127 lines (65 loc) · 2.97 KB
Raw

Git Exercise

Initial Git client configuration (set username and email, sign in to GitHub)

Verify Git is installed:

git -v

GitHub sign in/up

Git config:

  • Open Git Bash (for Windows, should be included with git installation) or terminal

  • Set your username:

    git config --global user.name "Your Name"

  • Set your email (same email used to sign in to GitHub):

    git config --global user.email "YOUR_EMAIL"

Generate ssh keys:

  • Enter the following in git bash or terminal:

    ssh-keygen -t ed25519 -C "[email protected]"

  • Press enter on the prompts that follow to save the key to the default location

  • Add the key to the SSH Agent

    eval "$(ssh-agent -s)"

    Mac:

    ssh-add --apple-use-keychain ~/.ssh/id_ed25519

    Windows:

    ssh-add ~/.ssh/id_ed25519

  • Open https://github.com/settings/keys and click the New SSH Key button

  • Give the key a title and paste your public key in the key field

  • Click Add SSH Key

Fork the tutorial repo

  • Navigate to the tutorial repo in your browser of choice

  • Click the Fork button

  • Click Create Fork to create a new repo in your account

Clone your new Repo to your machine

  • In your new repo, click the '<> Code' button

  • Under the Clone header, click the copy button to copy the url

  • Open or switch to a terminal window and navigate to the directory where you want your repo to exist. Then enter:

    git clone <your copied url>

Make a branch and add some content

git checkout -b <branch name>

  • Make some changes:

    • Add a new file <your_name>.md in the app/routes/ folder

    • Make a list in the file. Include your name and a note about a hobby you enjoy. Example:

      - Hi I am Dakota
- I like making music!

  • Add all your changes

    git add .

    Create a new commit

    git commit -m <Your commit message>

    Push it out

    git push --set-upstream origin <your_branch_name>

Make a PR, review someone else’s!

Making a PR

  • Navigate to your forked copy of the GitHub repo.

  • Click the Branches button

  • In the Your Branches table, click the New Pull Request button corresponding to your branch. This will navigate you the new PR form.

  • Give it a descriptive title

  • Use the Write tab to add any additional comments

  • Click Create Pull Request

Reviewing a PR

  • Navigate to the parent repo: https://github.com/nasa-gcn/web-dev-bootcamp

  • Click the Pull requests button in the page header

  • Click an open PR created by another attendee

  • Click Files changed to see their changes

  • Click the Review changes button to open the review dropdown

  • Add a comment in the textarea, check the Approve option (assuming their changes pass your review!), and click Submit Review to add your approval to the PR

Merge it!

You should now be back on the conversation tab of the same PR.

  • Click the Merge Pull Request button to merge their changes into the main branch

  • The branch may now be deleted