├── LICENSE ├── README.md ├── mac.md └── pc.md /LICENSE: -------------------------------------------------------------------------------- 1 | MIT License 2 | 3 | Copyright (c) 2019 Lambda, Inc. 4 | 5 | Permission is hereby granted, free of charge, to any person obtaining a copy 6 | of this software and associated documentation files (the "Software"), to deal 7 | in the Software without restriction, including without limitation the rights 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 9 | copies of the Software, and to permit persons to whom the Software is 10 | furnished to do so, subject to the following conditions: 11 | 12 | The above copyright notice and this permission notice shall be included in all 13 | copies or substantial portions of the Software. 14 | 15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 21 | SOFTWARE. 22 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # Git for Web Development Project 2 | 3 | Welcome to Day 1 at BloomTech! Today we are going to spend some time setting up your computer and learning the tools that you will be using to complete this program. Just like your first day at a dev job, you will need to get your environment set up to build and run your code. Before you are able to complete any of these steps, you will need to install all [required programs](https://www.notion.so/bloomtech/4da087ea26dd441bbc8030198811150d?v=5c67662450d14d64b0b2b6d32b841fee) then set up your SSH key and attach it to your GitHub account. For the SSH key, please watch the video on the [BloomTech Git Workflow](https://bloomtech.notion.site/bloomtech/BloomTech-Git-Flow-Step-by-step-269f68ae3bf64eb689a8328715a179f9) to see how to do that. 4 | 5 | Complete the set up tasks and then get started on the research questions found inside the repository. If you are using a Windows machine, please complete the `pc.md` file, if you are using Mac or Linux please complete `mac.md`. 6 | 7 | ## Task 1: MVP 8 | You will need to follow the [BloomTech Git Workflow](https://bloomtech.notion.site/bloomtech/BloomTech-Git-Flow-Step-by-step-269f68ae3bf64eb689a8328715a179f9) to add a file to this project follow the steps below: 9 | 10 | - [ ] Create your own version of this repo using the fork button at the top right of the repository 11 | - [ ] Clone this repo by clicking the green Code button, then copy pasting the SSH URL: `git clone git@github.com:YOUR-GITHUB-USERNAME/Git-for-Web-Development-Project.git` 12 | - [ ] Create a branch: `git checkout -b 'FIRSTNAME-LASTNAME'` 13 | - [ ] Answer the questions in the `mac.md` or `pc.md` file, depending on which operating system you are using. 14 | - [ ] Follow the steps for adding, committing, and pushing your work from your local computer to GitHub: 1. `git add FILE-NAME` 2. `git commit -m 'WRITE A MESSAGE TO DESCRIBE YOUR CHANGES HERE'` 3. `git push -u origin FIRSTNAME-LASTNAME` 15 | - [ ] Create a Pull Request to submit your work. Reference the [BloomTech Git Workflow](https://bloomtech.notion.site/bloomtech/BloomTech-Git-Flow-Step-by-step-269f68ae3bf64eb689a8328715a179f9) for help with this. 16 | - [ ] Make sure that your repository's main branch is listed on the left side of the screen and your repository's FIRSTNAME-LASTNAME branch is listed on the right side. This is telling GitHub that you want to compare the work you did in your FIRSTNAME-LASTNAME branch to the work in your main branch. Make sure that you don't click the "merge" button! 17 | 18 | ## Submission Instructions 19 | 20 | Please submit your project via Canvas by following [these instructions](https://bloomtech.notion.site/BloomTech-Git-Flow-Step-by-step-269f68ae3bf64eb689a8328715a179f9). See part 1, "Submitting an Assignment Without CodeGrade." You will need to submit your Pull Request URL in Canvas to turn in today's assignment. 21 | -------------------------------------------------------------------------------- /mac.md: -------------------------------------------------------------------------------- 1 | ## Research Questions 2 | 3 | Now that you are all set up, it's time to learn a little more about the tools of the trade. Edit this file and answer the following questions. You are going to need to start familiarizing yourself with the [GitHub docs](https://docs.github.com/en). Docs (short for documentation) are the instructions on how to use a languge or program. A large part of your job as a developer will be learning how to read and work with documentation. Please reference the GitHub docs when answering the questions below. If you cannot find what you are looking for in the docs, you can always start to practice your Google skills! 4 | 5 | 1. What is Git? 6 | 2. What is the difference between Git and GitHub? 7 | 3. Why do we create a branch? 8 | 4. What is the purpose of a Pull Request? 9 | 5. What is the command you can use to switch between branches? For example you are working on FIRSTNAME-LASTNAME branch and you want to switch back to main. 10 | 6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do? 11 | 7. What is a merge conflict? 12 | 8. How do you resolve a merge conflict? 13 | -------------------------------------------------------------------------------- /pc.md: -------------------------------------------------------------------------------- 1 | ## Research Questions 2 | 3 | Now that you are all set up, it's time to learn a little more about the tools of the trade. Edit this file and answer the following questions. You are going to need to start familiarizing yourself with the [GitHub docs](https://docs.github.com/en). Docs (short for documentation) are the instructions on how to use a languge or program. A large part of your job as a developer will be learning how to read and work with documentation. Please reference the GitHub docs when answering the questions below. If you cannot find what you are looking for in the docs, you can always start to practice your Google skills! 4 | 5 | 1. What is Git? 6 | 2. What is the difference between Git and GitHub? 7 | 3. Why do we create a branch? 8 | 4. What is the purpose of a Pull Request? 9 | 5. What is the command you can use to switch between branches? For example you are working on the FIRSTNAME-LASTNAME branch and you want to switch back to main. 10 | 6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do? 11 | 7. What is a merge conflict? 12 | 8. How do you resolve a merge conflict? 13 | --------------------------------------------------------------------------------