From e44944aa2f547c31d5c2ee400a6af9cbba55bfe1 Mon Sep 17 00:00:00 2001 From: Sterling Sanders Date: Sat, 18 Feb 2023 22:32:12 -0800 Subject: [PATCH] Changes made were that I answered all of the research questions in mac.md --- mac.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/mac.md b/mac.md index ffaca0596..93c172e21 100644 --- a/mac.md +++ b/mac.md @@ -10,3 +10,28 @@ 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.git keeps track of changes made to files on your computer. It +allows you to make changes while also keeping all former versions of +the file. +2. git is a version control system for you and your source code +present and past whereas github is a cloud service that allows you to +manage git repositories. +3.we create a branch so that we dont mess with the main version of +the repository. instead we work on a clone just in case the changes +fail, then if they do end up being valid changes we can merge the +changes back into the main branch. +4.pull requestes are used to look at both the main branch and +others(while highlighting the changes made) before merging them back +into one. +5. 'git checkout "name of banch"' to switch branches +6. git fetch updates the local repository but does not merge with the +main. git pull does what git fetch does but goes even further and +merges it with the main repository.git merge merges the branches or +repositories back into one. +7. a merge conflict typically happens when for example 2 people +change the same line of code in a file before merging or if one +person deltes a file while another is modifying it. +8.ro resolve a merge conflict, just go into the file and make the +necessary changes. after making the changes use git add and git +commit to commit t he new changes before trying to merge again.