diff --git a/README.md b/README.md index 87a954473..915874f1a 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ Complete the set up tasks and then get started on the research questions found i ## Task 1: MVP 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: -- [ ] Create your own version of this repo using the fork button at the top right of the repository -- [ ] 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` -- [ ] Create a branch: `git checkout -b 'FIRSTNAME-LASTNAME'` +- [x] Create your own version of this repo using the fork button at the top right of the repository +- [x] 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` +- [x] Create a branch: `git checkout -b 'FIRSTNAME-LASTNAME'` - [ ] Answer the questions in the `mac.md` or `pc.md` file, depending on which operating system you are using. - [ ] 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` - [ ] 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. diff --git a/pc.md b/pc.md index 28a9c65d6..29f8e22a9 100644 --- a/pc.md +++ b/pc.md @@ -10,3 +10,13 @@ Now that you are all set up, it's time to learn a little more about the tools of 6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do? 7. What is a merge conflict? 8. How do you resolve a merge conflict? + + +1. Version control system that keeps track of file or code changes in a computer directory. +2. The Difference between Git and Git hub is that Git allows you to make chages on a repository and Git hub is the staging area of the main or forked repositories. +3. We create a branch because it is unique to you to show what changes are being made to the main branch through your created branch. +4. It tells others about changes pushed to a branch on a repository. +5. Get checkout then branch name +6. Git fetch is used to download contents from a remote repository. Git merge is diferent by the way all the content comes together from different branches. Git Pull is similar to git fetch but it update immeditely the local master repository to match the content. +7. Unable of automatically resolve differences in code between two commits on same branch. +8. Go to your pull request click resolve make any changes and create a new commit command using git. \ No newline at end of file