Git Cheatsheet

Set up your repository

1. Fork url
• Go to the Github page you want to fork
• Click the fork icon at top-right of page.
2. Enable issues
• Go to repository settings located at bottom right of navigation bar
• Check the "issues" box
3. Clone url
• Copy url link from forked repository
• Enter code into terminal, replace "url" with copied url:

      git clone "url"
    

4. Check the remote
• This will tell you where pulls and pushes are pointing to.

      git remote -v
    

5. Set up your upstream
• Copy original url (not forked repo)
• Enter code, replacing "url" with copied url:

      git remote add upstream "url"
    

6. Check the remote again
• This will tell you where pulls, pushes, and fetches are pointing to.

      git remote -v
    

Fetching Changes

1. Check the remote for upstream and origin fetch and push

      git remote -v
    

2. Fetch the changes

      git fetch upstream
    

3. Merge the changes

      git merge upstream/master
    

4. Commit and push the changes

      git commit -m "Message for the commit"
      git push origin master
    

5. Check Github
• Go to Github to verify the changes were made

Git Work Flow and Branching

1. Add collaborators
• Go to your repository
• Go to your settings on the right side of page
• Add your collaborators
2. Clone the repository
• All collaborators must clone the repository
• Follow steps above for cloning
3. Create Feature Branch
• Type following code, make up a "branch-name"

      git checkout -b "branch-name"
    

• Now you're in a branch of the repository
4. Make your changes
• Make the changes to files you need to
• Push changes from branch to GitHub

      git push origin "branch-name"
    

5. Create a Pull Request
• Go to GitHub repository
• Click green "pull request" button
• Add a commit message
• Tag contributors using @user_name, as needed
• Add comments to lines of code, as needed
• Submit pull request
6. Review Pull Request
• "Master" person should look over changes
• Merge the pull request in GitHub
7. Merge Conflicts
• If a person pushes changes where a merge conflict exists, you will get a merge conflict.
• Type the following to check which files have merge conflicts:

      git status
    

• Go into that file, and you will see something like this:

      <<<<<<<<HEAD<<<<<<<<<<

      some_code

      ==================================

      other_code

      >>>>>>>>small_conflict>>>>>>>>
  

• Choose which side of the "====" bar you want to keep, delete everything else.
• Commit changes again and push.