From 8ce04a278c47e257edee182aaf5604d4676762c4 Mon Sep 17 00:00:00 2001 From: JasonGenerix <37448660+JasonGenerix@users.noreply.github.com> Date: Sat, 25 Mar 2023 23:03:16 -0400 Subject: [PATCH 1/3] answered the questions in pc.md --- pc.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pc.md b/pc.md index 28a9c65d6..a220436cc 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. Git is a an open source version control system that aides in source code management. +2. Git is a version control system that lets you track and manage code history where as github is a cloud based hosting service that lets you manage git repo's. +3. Git branches are used to create separate lines of developments within a git repo. Branches allow multiple devs to work on differnt features to a project simultaneously without affecting each other's work. +4. The purpose of a pull request is to facilitate code review and and collaboration between devs. You can leave comments and suggest modifications in pull requests which can ensure that the changes are well-designed, correctly implemented, and do not introduce any unintended side effects. +5. git checkout +6. 'git fetch' fetches changes from the remote repo but doesn't merge them with the local branch. 'git merge' merges changes from one branch into another branch to create a new commit. 'git pull' is a combination of the two where it fetches changes from the remote repo and merges them into the current branch. +7. A merge conflict is when git is unable to autmoatically merge changes from two different branches. Typically when two or more people modiify the same line of code. +8. To resolve a merge conflict, you can manually edit the conflicted files to remove the conflicts and make the necessary changes. From fb70e452c1701929f90aa28764ac1a30428fe22d Mon Sep 17 00:00:00 2001 From: JasonGenerix <37448660+JasonGenerix@users.noreply.github.com> Date: Sat, 25 Mar 2023 23:06:31 -0400 Subject: [PATCH 2/3] answered the questions in pc.md --- pc.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pc.md b/pc.md index a220436cc..741d428f4 100644 --- a/pc.md +++ b/pc.md @@ -12,11 +12,11 @@ Now that you are all set up, it's time to learn a little more about the tools of 8. How do you resolve a merge conflict? -1. Git is a an open source version control system that aides in source code management. -2. Git is a version control system that lets you track and manage code history where as github is a cloud based hosting service that lets you manage git repo's. -3. Git branches are used to create separate lines of developments within a git repo. Branches allow multiple devs to work on differnt features to a project simultaneously without affecting each other's work. -4. The purpose of a pull request is to facilitate code review and and collaboration between devs. You can leave comments and suggest modifications in pull requests which can ensure that the changes are well-designed, correctly implemented, and do not introduce any unintended side effects. -5. git checkout -6. 'git fetch' fetches changes from the remote repo but doesn't merge them with the local branch. 'git merge' merges changes from one branch into another branch to create a new commit. 'git pull' is a combination of the two where it fetches changes from the remote repo and merges them into the current branch. -7. A merge conflict is when git is unable to autmoatically merge changes from two different branches. Typically when two or more people modiify the same line of code. -8. To resolve a merge conflict, you can manually edit the conflicted files to remove the conflicts and make the necessary changes. +1.Git is a an open source version control system that aides in source code management. +2.Git is a version control system that lets you track and manage code history where as github is a cloud based hosting service that lets you manage git repo's. +3.Git branches are used to create separate lines of developments within a git repo. Branches allow multiple devs to work on differnt features to a project simultaneously without affecting each other's work. +4.The purpose of a pull request is to facilitate code review and and collaboration between devs. You can leave comments and suggest modifications in pull requests which can ensure that the changes are well-designed, correctly implemented, and do not introduce any unintended side effects. +5.git checkout +6.'git fetch' fetches changes from the remote repo but doesn't merge them with the local branch. 'git merge' merges changes from one branch into another branch to create a new commit. 'git pull' is a combination of the two where it fetches changes from the remote repo and merges them into the current branch. +7.A merge conflict is when git is unable to autmoatically merge changes from two different branches. Typically when two or more people modiify the same line of code. +8.To resolve a merge conflict, you can manually edit the conflicted files to remove the conflicts and make the necessary changes. From b793742b283a04f3b16d0855d6a95113c43a8a93 Mon Sep 17 00:00:00 2001 From: JasonGenerix <37448660+JasonGenerix@users.noreply.github.com> Date: Sat, 25 Mar 2023 23:09:26 -0400 Subject: [PATCH 3/3] fixed the structing of the answers --- pc.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pc.md b/pc.md index 741d428f4..aea241b4c 100644 --- a/pc.md +++ b/pc.md @@ -12,11 +12,18 @@ Now that you are all set up, it's time to learn a little more about the tools of 8. How do you resolve a merge conflict? -1.Git is a an open source version control system that aides in source code management. -2.Git is a version control system that lets you track and manage code history where as github is a cloud based hosting service that lets you manage git repo's. -3.Git branches are used to create separate lines of developments within a git repo. Branches allow multiple devs to work on differnt features to a project simultaneously without affecting each other's work. -4.The purpose of a pull request is to facilitate code review and and collaboration between devs. You can leave comments and suggest modifications in pull requests which can ensure that the changes are well-designed, correctly implemented, and do not introduce any unintended side effects. +1.Git is a an open source version control system that aides in source code management. + +2.Git is a version control system that lets you track and manage code history where as github is a cloud based hosting service that lets you manage git repo's. + +3.Git branches are used to create separate lines of developments within a git repo. Branches allow multiple devs to work on differnt features to a project simultaneously without affecting each other's work. + +4.The purpose of a pull request is to facilitate code review and and collaboration between devs. You can leave comments and suggest modifications in pull requests which can ensure that the changes are well-designed, correctly implemented, and do not introduce any unintended side effects. + 5.git checkout + 6.'git fetch' fetches changes from the remote repo but doesn't merge them with the local branch. 'git merge' merges changes from one branch into another branch to create a new commit. 'git pull' is a combination of the two where it fetches changes from the remote repo and merges them into the current branch. + 7.A merge conflict is when git is unable to autmoatically merge changes from two different branches. Typically when two or more people modiify the same line of code. + 8.To resolve a merge conflict, you can manually edit the conflicted files to remove the conflicts and make the necessary changes.