From 2065198e5d53187f4c2846053105529e42d0619e Mon Sep 17 00:00:00 2001 From: DavidAbili1 <104179991+DavidAbili1@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:07:01 -0400 Subject: [PATCH 1/6] Update answer.txt --- answer.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/answer.txt b/answer.txt index e8695c93..a560af10 100644 --- a/answer.txt +++ b/answer.txt @@ -1,2 +1,2 @@ What is the difference between a merge and a rebase? -When you merge you are combinding 2 branches and rebase and when you rebase you a move changes from one branch to another branch +When you merge you are combining 2 branches and rebase and when you rebase you move changes from one branch to another branch From 269a03548b297b22711bd34736baa6974ef625a0 Mon Sep 17 00:00:00 2001 From: David Abili Date: Fri, 8 Sep 2023 12:34:54 -0400 Subject: [PATCH 2/6] part 4 done --- answer.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/answer.txt b/answer.txt index a560af10..755d6ad2 100644 --- a/answer.txt +++ b/answer.txt @@ -1,2 +1,5 @@ What is the difference between a merge and a rebase? + + + When you merge you are combining 2 branches and rebase and when you rebase you move changes from one branch to another branch From b4ee35b261694386d4bc537059879d4c374d22a1 Mon Sep 17 00:00:00 2001 From: David Abili Date: Fri, 8 Sep 2023 12:39:29 -0400 Subject: [PATCH 3/6] done? --- answer.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/answer.txt b/answer.txt index 755d6ad2..ae989d27 100644 --- a/answer.txt +++ b/answer.txt @@ -1,5 +1,3 @@ -What is the difference between a merge and a rebase? +What is a remote repository? - - -When you merge you are combining 2 branches and rebase and when you rebase you move changes from one branch to another branch +A repository that can be seen by many people and similar to a local repository there is a history. From 4114c4cd24437eccb64d66adc24a694002736861 Mon Sep 17 00:00:00 2001 From: DavidAbili1 <104179991+DavidAbili1@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:03:33 -0400 Subject: [PATCH 4/6] Create answer.txt --- answer.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 answer.txt diff --git a/answer.txt b/answer.txt new file mode 100644 index 00000000..e8695c93 --- /dev/null +++ b/answer.txt @@ -0,0 +1,2 @@ +What is the difference between a merge and a rebase? +When you merge you are combinding 2 branches and rebase and when you rebase you a move changes from one branch to another branch From 430ce08ddae336f7ddb20e35ab5c3e47b03283d9 Mon Sep 17 00:00:00 2001 From: David Abili Date: Fri, 8 Sep 2023 12:43:29 -0400 Subject: [PATCH 5/6] done! --- answer.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/answer.txt b/answer.txt index e8695c93..312169d6 100644 --- a/answer.txt +++ b/answer.txt @@ -1,2 +1,3 @@ What is the difference between a merge and a rebase? + When you merge you are combinding 2 branches and rebase and when you rebase you a move changes from one branch to another branch From cde6cbf11f611de1c8ff8866cbca85ac7d145eba Mon Sep 17 00:00:00 2001 From: David Abili Date: Fri, 8 Sep 2023 12:56:03 -0400 Subject: [PATCH 6/6] finished --- answer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/answer.txt b/answer.txt index 7abc814d..9b0dfacd 100644 --- a/answer.txt +++ b/answer.txt @@ -1,8 +1,8 @@ What is the difference between a merge and a rebase? -When you merge you are combinding 2 branches and rebase and -when you rebase you a move changes from one branch to another branch +When you merge you are combinding 2 branches and rebase and when you rebase you +a move changes from one branch to another branch What is a remote repository?