From fd5af7357296f9f8da942cee4bd7e6fbe1196baa Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Fri, 24 Mar 2023 15:17:57 -0400 Subject: [PATCH 1/2] hello world text test --- pc.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pc.md b/pc.md index 28a9c65d6..1012c92af 100644 --- a/pc.md +++ b/pc.md @@ -10,3 +10,5 @@ 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? + +Hello World! From 4104f258461339e89351feccb77fbd2ad2f3c358 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Fri, 24 Mar 2023 15:33:32 -0400 Subject: [PATCH 2/2] completed module 1 challenge --- pc.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pc.md b/pc.md index 1012c92af..edf60a5be 100644 --- a/pc.md +++ b/pc.md @@ -3,12 +3,19 @@ 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! 1. What is Git? + A program that runs bash commands 2. What is the difference between Git and GitHub? + Git is a program that runs commands for managing files and repositories. + GitHub is a cloud-based server that houses files and repositories. 3. Why do we create a branch? + To ensure version control and enable a streamlined workflow in the case of multiple simultaneous users. 4. What is the purpose of a Pull Request? + To connect local and cloud-based repositories. 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. + git checkout -b main (confirm current branch with git branch) 6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do? + git fetch pulls in files from your remote hub without changing your local files, git merge moves a forked branch back into the main, git pull pulls remote files and simultaneously updates local files to match 7. What is a merge conflict? + a merge command that returns an error for competing commits 8. How do you resolve a merge conflict? - -Hello World! + open the conflicting file and make necessary changes