From fc5423294c18900098163e7236ddd1acbe9b0620 Mon Sep 17 00:00:00 2001 From: Jcantelmi-1 <68699239+Jcantelmi-1@users.noreply.github.com> Date: Wed, 22 Feb 2023 14:51:42 -0500 Subject: [PATCH 1/3] Create answers.txt --- answers.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 answers.txt diff --git a/answers.txt b/answers.txt new file mode 100644 index 00000000..0c32c330 --- /dev/null +++ b/answers.txt @@ -0,0 +1,6 @@ +What is the difference between a merge and a rebase? + +Both involve working with the branches of a repository. When you're working on a branch and want to update the base of the branch (the snapshot of the repository from when you branched out) to the latest version, you use git rebase. When you want to merge two different branches together into one functional branch (such as the main branch) use git merge. + +Note: I tried to answer this from memory as a test of what I've learned, and I have no idea what I'm talking about. I'm gonna leave it as is. + From 4ebb718157ed68ba969a4c88a9adea955d489306 Mon Sep 17 00:00:00 2001 From: Jcantelmi-1 <68699239+Jcantelmi-1@users.noreply.github.com> Date: Wed, 22 Feb 2023 14:52:55 -0500 Subject: [PATCH 2/3] Update answers.txt --- answers.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/answers.txt b/answers.txt index 0c32c330..bf5a1b0a 100644 --- a/answers.txt +++ b/answers.txt @@ -4,3 +4,7 @@ Both involve working with the branches of a repository. When you're working on a Note: I tried to answer this from memory as a test of what I've learned, and I have no idea what I'm talking about. I'm gonna leave it as is. + +What is a remote repository? + +A remote repository is a git repository that's hosted on the internet or another network instead of your computer. From d30c4bc006b6c1ec6e396e999140a940a53bb036 Mon Sep 17 00:00:00 2001 From: Jcantelmi-1 <68699239+Jcantelmi-1@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:13:01 -0500 Subject: [PATCH 3/3] Update answers.txt --- answers.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/answers.txt b/answers.txt index bf5a1b0a..6dc56bc4 100644 --- a/answers.txt +++ b/answers.txt @@ -1,10 +1,3 @@ -What is the difference between a merge and a rebase? - -Both involve working with the branches of a repository. When you're working on a branch and want to update the base of the branch (the snapshot of the repository from when you branched out) to the latest version, you use git rebase. When you want to merge two different branches together into one functional branch (such as the main branch) use git merge. - -Note: I tried to answer this from memory as a test of what I've learned, and I have no idea what I'm talking about. I'm gonna leave it as is. - - What is a remote repository? A remote repository is a git repository that's hosted on the internet or another network instead of your computer.